Merge branch 'master' into cover_thumbnail

# Conflicts: # cps/editbooks.py # cps/helper.py # cps/web.py # test/Calibre-Web TestSummary_Linux.html
2022-03-14 19:41:47 +01:00
parent 8f665ebd58 8f3bb2e338
commit d9a83e0638
48 changed files with 1053 additions and 1047 deletions
@@ -888,5 +888,5 @@ def session_commit(success=None, _session=None):
            log.info(success)
    except (exc.OperationalError, exc.InvalidRequestError) as e:
        s.rollback()
-        log.debug_or_exception(e)
+        log.error_or_exception(e)
    return ""