x/slogging
Code Issues Proposed changes

removed cancel_join_thread call

Browse Source
This commit is contained in:
John Dickinson 2012-02-24 09:52:31 -06:00
parent e1f6ae55f8
commit 84b9818228
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slogging/log_common.py
View File

@ -201,16 +201,12 @@ def multiprocess_collate(processor_klass, processor_args, processor_method,
def collate_worker(processor_klass, processor_args, processor_method, in_queue, def collate_worker(processor_klass, processor_args, processor_method, in_queue,
out_queue): out_queue):
'''worker process for multiprocess_collate''' '''worker process for multiprocess_collate'''
in_queue.cancel_join_thread()
out_queue.cancel_join_thread()
try: try:
p = processor_klass(*processor_args) p = processor_klass(*processor_args)
while True: while True:
item = in_queue.get() item = in_queue.get()
if item is None: if item is None:
# no more work to process # no more work to process
in_queue.close()
out_queue.close()
break break
try: try:
method = getattr(p, processor_method) method = getattr(p, processor_method)
@ -223,5 +219,6 @@ def collate_worker(processor_klass, processor_args, processor_method, in_queue,
out_queue.put((item, ret)) out_queue.put((item, ret))
except Exception, err: except Exception, err:
print '****ERROR in worker****\n%r\n********' % err print '****ERROR in worker****\n%r\n********' % err
finally:
in_queue.close() in_queue.close()
out_queue.close() out_queue.close()