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

Don't depend on global vars in daemon

Browse source 
See #167
This commit is contained in:
Markus Unterwaditzer 2015-01-19 20:43:46 +01:00
parent a02fd034e4
commit c7bd51b56f
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
vdirsyncer/cli/utils.py
View file

@ -457,11 +457,18 @@ class WorkerQueue(object):
self._max_workers = max_workers self._max_workers = max_workers
def _worker(self): def _worker(self):
# This is a daemon thread. Since the global namespace is going to
# vanish on interpreter shutdown, redefine everything from the global
# namespace here.
_TypeError = TypeError
_Empty = queue.Empty
_handle_cli_error = handle_cli_error
while True: while True:
try: try:
func = self._queue.get() func = self._queue.get()
except (TypeError, queue.Empty): except (_TypeError, _Empty):
# TypeError might be raised if vdirsyncer just finished # Any kind of error might be raised if vdirsyncer just finished
# processing all items and the interpreter is shutting down, # processing all items and the interpreter is shutting down,
# yet the workers try to get new tasks. # yet the workers try to get new tasks.
# https://github.com/untitaker/vdirsyncer/issues/167 # https://github.com/untitaker/vdirsyncer/issues/167
@ -471,7 +478,7 @@ class WorkerQueue(object):
try: try:
func(wq=self) func(wq=self)
except: except:
if not handle_cli_error(): if not _handle_cli_error():
self._exceptions.append(sys.exc_info()[1]) self._exceptions.append(sys.exc_info()[1])
finally: finally:
self._queue.task_done() self._queue.task_done()