Browse Source

stop referencing connection and queue_name

pull/1/head
Brett Langdon 11 years ago
parent
commit
65d81b77fd
2 changed files with 3 additions and 14 deletions
  1. +0
    -10
      bin/qw-manager
  2. +3
    -4
      qw/manager.py

+ 0
- 10
bin/qw-manager View File

@ -43,18 +43,8 @@ manager.start()
def stop_handler(signum, frame):
manager.stop()
def info_handler(signum, frame):
print "All Queued Jobs:"
for job in manager.get_all_queued_jobs():
print job
print "Current Pending Jobs:"
for worker, job in manager.get_worker_pending_jobs():
print "%s: %s" % (worker, job)
signal.signal(signal.SIGTERM, stop_handler)
signal.signal(signal.SIGHUP, stop_handler)
signal.signal(signal.SIGINT, info_handler)
try:
manager.join()


+ 3
- 4
qw/manager.py View File

@ -2,7 +2,6 @@ import logging
import multiprocessing
import socket
from qw import queue_name
from qw.client import Client
from qw.exception import AlreadyStartedException, NotStartedException
from qw.worker import Worker
@ -25,10 +24,10 @@ class Manager(object):
self.log.info("starting %s workers", self.num_workers, extra={"process_name": self.name})
for _ in xrange(self.num_workers):
worker = Worker(self.connection, manager_name=self.name)
worker = Worker(self.client, manager_name=self.name)
worker.start()
self.workers.append(worker)
self.log.info("registering %s under %s", self.name, queue_name.ALL_MANAGERS, extra={"process_name": self.name})
self.log.info("registering %s", self.name, extra={"process_name": self.name})
self.client.register_manager(self.name)
def join(self):
@ -48,7 +47,7 @@ class Manager(object):
if not self.workers:
raise NotStartedException("Workers Do Not Exist")
self.log.info("deregistering %s from %s", self.name, queue_name.ALL_MANAGERS, extra={"process_name": self.name})
self.log.info("deregistering %s", self.name, extra={"process_name": self.name})
self.client.deregister_manager(self.name)
self.log.info("shutting down %s workers", len(self.workers), extra={"process_name": self.name})


Loading…
Cancel
Save