sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid daemon threads

Browse source 
See #291
This commit is contained in:
Markus Unterwaditzer 2015-11-06 18:09:54 +01:00
parent 20e04e6bff
commit b7542fb536
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vdirsyncer/cli/utils.py
View file

@ -410,10 +410,9 @@ class WorkerQueue(object):
self._shutdown_handlers = [] self._shutdown_handlers = []
def shutdown(self): def shutdown(self):
if not self._queue.unfinished_tasks: while self._shutdown_handlers:
for handler in self._shutdown_handlers:
try: try:
handler() self._shutdown_handlers.pop()()
except Exception: except Exception:
pass pass
@ -439,7 +438,6 @@ class WorkerQueue(object):
return return
t = click_threading.Thread(target=self._worker) t = click_threading.Thread(target=self._worker)
t.daemon = True
t.start() t.start()
self._workers.append(t) self._workers.append(t)
@ -452,6 +450,8 @@ class WorkerQueue(object):
yield yield
ui_worker.run() ui_worker.run()
self._queue.join() self._queue.join()
for worker in self._workers:
worker.join()
if self._exceptions: if self._exceptions:
sys.exit(1) sys.exit(1)