From 6dae187e226c43f29657ab8ee3c46093b6752d83 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Tue, 28 Jan 2020 16:56:35 +0100 Subject: [PATCH] More detailed logging on write error --- src/Worker/Worker.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Worker/Worker.py b/src/Worker/Worker.py index b8eb4471..4cf04d97 100644 --- a/src/Worker/Worker.py +++ b/src/Worker/Worker.py @@ -114,9 +114,9 @@ class Worker(object): task["site"].storage.write(task["inner_path"], buff) except Exception as err: if type(err) == Debug.Notify: - self.manager.log.debug("%s: Write aborted: %s (%s)" % (self.key, task["inner_path"], err)) + self.manager.log.debug("%s: Write aborted: %s (%s: %s)" % (self.key, task["inner_path"], type(err), err)) else: - self.manager.log.error("%s: Error writing: %s (%s)" % (self.key, task["inner_path"], err)) + self.manager.log.error("%s: Error writing: %s (%s: %s)" % (self.key, task["inner_path"], type(err), err)) raise WorkerIOError(str(err)) def onTaskVerifyFail(self, task, error_message): @@ -226,7 +226,7 @@ class Worker(object): def skip(self, reason="Unknown"): self.manager.log.debug("%s: Force skipping (reason: %s)" % (self.key, reason)) if self.thread: - self.thread.kill(exception=Debug.Notify("Worker stopped")) + self.thread.kill(exception=Debug.Notify("Worker skipping (reason: %s)" % reason)) self.start() # Force stop the worker @@ -234,6 +234,6 @@ class Worker(object): self.manager.log.debug("%s: Force stopping (reason: %s)" % (self.key, reason)) self.running = False if self.thread: - self.thread.kill(exception=Debug.Notify("Worker stopped")) + self.thread.kill(exception=Debug.Notify("Worker stopped (reason: %s)" % reason)) del self.thread self.manager.removeWorker(self)