oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More detailed logging on write error

Browse source
This commit is contained in:
shortcutme 2020-01-28 16:56:35 +01:00
parent a7e783a26b
commit 6dae187e22
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Worker/Worker.py
View file

@ -114,9 +114,9 @@ class Worker(object):
task["site"].storage.write(task["inner_path"], buff) task["site"].storage.write(task["inner_path"], buff)
except Exception as err: except Exception as err:
if type(err) == Debug.Notify: 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: 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)) raise WorkerIOError(str(err))
def onTaskVerifyFail(self, task, error_message): def onTaskVerifyFail(self, task, error_message):
@ -226,7 +226,7 @@ class Worker(object):
def skip(self, reason="Unknown"): def skip(self, reason="Unknown"):
self.manager.log.debug("%s: Force skipping (reason: %s)" % (self.key, reason)) self.manager.log.debug("%s: Force skipping (reason: %s)" % (self.key, reason))
if self.thread: if self.thread:
self.thread.kill(exception=Debug.Notify("Worker stopped")) self.thread.kill(exception=Debug.Notify("Worker skipping (reason: %s)" % reason))
self.start() self.start()
# Force stop the worker # Force stop the worker
@ -234,6 +234,6 @@ class Worker(object):
self.manager.log.debug("%s: Force stopping (reason: %s)" % (self.key, reason)) self.manager.log.debug("%s: Force stopping (reason: %s)" % (self.key, reason))
self.running = False self.running = False
if self.thread: 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 del self.thread
self.manager.removeWorker(self) self.manager.removeWorker(self)