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
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -198,7 +198,7 @@ class CalibreTask:
            self.run(*args)
        except Exception as ex:
            self._handleError(str(ex))
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)

        self.end_time = datetime.now()