diff --git a/bin/minion.py b/bin/minion.py index 2433dca..78db766 100644 --- a/bin/minion.py +++ b/bin/minion.py @@ -66,8 +66,6 @@ if __name__ == '__main__': print "%s: master said go!!" % myname if action in ('teardown', 'slay'): - # take back one name ? - # masterq.get() break while not tasksq.empty(): diff --git a/interp/cluster/__init__.py b/interp/cluster/__init__.py index 9c9e03a..5203f3a 100644 --- a/interp/cluster/__init__.py +++ b/interp/cluster/__init__.py @@ -1,21 +1,28 @@ from multiprocessing.managers import BaseManager import Queue -tasks_q = Queue.Queue() -results_q = Queue.Queue() +tasks_q = Queue.Queue() +results_q = Queue.Queue() minions_q = Queue.Queue() -master_q = Queue.Queue() +master_q = Queue.Queue() class QueueManager(BaseManager): + """ + One QueueManager to rule all network Queues + """ pass -QueueManager.register('get_tasks_q', callable=lambda:tasks_q ) -QueueManager.register('get_results_q', callable=lambda:results_q) -QueueManager.register('get_minions_q', callable=lambda:minions_q ) -QueueManager.register('get_master_q', callable=lambda:master_q ) +QueueManager.register('get_tasks_q' , callable=lambda:tasks_q ) +QueueManager.register('get_results_q', callable=lambda:results_q ) +QueueManager.register('get_minions_q', callable=lambda:minions_q ) +QueueManager.register('get_master_q' , callable=lambda:master_q ) -def get_qs(m): +def get_qs(qm): """ - returns all relevant queues + pass in a QueueManager, and this function returns all relevant + queues attached to that QueueManager. """ - return (m.get_tasks_q(), m.get_results_q(), m.get_master_q(), m.get_minions_q()) + return (qm.get_tasks_q(), + qm.get_results_q(), + qm.get_master_q(), + qm.get_minions_q())