Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tighten up ConnectedWorker main loop

Browse Source
This commit is contained in:
Kovid Goyal 2017-08-05 23:21:14 +05:30
parent 8e0425134f
commit 847fe898d0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/srv/tests/loop.py
View File

@ -283,6 +283,7 @@ class LoopTest(BaseTest):
status, result, tb, was_aborted = jm.job_status(job_id) status, result, tb, was_aborted = jm.job_status(job_id)
self.assertEqual(status, 'finished') self.assertEqual(status, 'finished')
self.assertFalse(was_aborted) self.assertFalse(was_aborted)
self.assertTrue(tb), self.assertIn('a testing error', tb) self.assertTrue(tb)
self.assertIn('a testing error', tb)
jm.start_job('simple test', 'calibre.srv.jobs', 'sleep_test', args=(1.0,)) jm.start_job('simple test', 'calibre.srv.jobs', 'sleep_test', args=(1.0,))
jm.shutdown(), jm.wait_for_shutdown(monotonic() + 1) jm.shutdown(), jm.wait_for_shutdown(monotonic() + 1)

9
src/calibre/utils/ipc/simple_worker.py
View File

@ -38,13 +38,11 @@ class ConnectedWorker(Thread):
self.res = None self.res = None
def run(self): def run(self):
conn = tb = None conn = None
try: try:
conn = eintr_retry_call(self.listener.accept) conn = eintr_retry_call(self.listener.accept)
except: except BaseException:
tb = traceback.format_exc() self.tb = traceback.format_exc()
if conn is None:
self.tb = tb
return return
self.accepted = True self.accepted = True
with closing(conn): with closing(conn):
@ -324,4 +322,3 @@ def offload():
res['tb'] = traceback.format_exc() res['tb'] = traceback.format_exc()
eintr_retry_call(conn.send, res) eintr_retry_call(conn.send, res)