From 65d81b77fdf2c5a11fd2f38aac2b80d03896d152 Mon Sep 17 00:00:00 2001
From: brettlangdon <brett@blangdon.com>
Date: Thu, 9 Oct 2014 12:58:13 -0400
Subject: [PATCH] stop referencing connection and queue_name

---
 bin/qw-manager | 10 ----------
 qw/manager.py  |  7 +++----
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/bin/qw-manager b/bin/qw-manager
index 4694387..f9cdf84 100755
--- a/bin/qw-manager
+++ b/bin/qw-manager
@@ -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()
diff --git a/qw/manager.py b/qw/manager.py
index 80742b2..37b8e60 100644
--- a/qw/manager.py
+++ b/qw/manager.py
@@ -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})