Merge branch 'master' into nomenclature

Conflicts:
	test/data/test.db
This commit is contained in:
Jake Moshenko 2014-11-17 17:59:59 -05:00
commit f4681f2c18
60 changed files with 1716 additions and 496 deletions

View file

@ -122,6 +122,8 @@ class Worker(object):
with self._current_item_lock:
current_queue_item = self.current_queue_item
if current_queue_item is None:
# Close the db handle.
self._close_db_handle()
break
logger.debug('Queue gave us some work: %s', current_queue_item.body)
@ -143,7 +145,7 @@ class Worker(object):
self._stop.set()
finally:
# Close the db handle periodically
# Close the db handle.
self._close_db_handle()
if not self._stop.is_set():