fixed some issues with registering khans

Author: Matt George

pyres/__init__.py

@@ -258,9 +258,7 @@ def encode(cls, item):
 
     @classmethod
     def decode(cls, item):
-        print item
         if isinstance(item, basestring):
-            
             ret = json.loads(item)
             return ret
         return None

pyres/horde.py

@@ -164,14 +164,14 @@ def setup_resq(self):
             self.resq = self.server
         else:
             raise Exception("Bad server argument")
+    
     def validate_queues(self):
         "Checks if a worker is given atleast one queue to work on."
         if not self.queues:
             raise NoQueueError("Please give each worker at least one queue.")
 
     def startup(self):
         self.register_signal_handlers()
-        self.register_worker()
 
     def register_signal_handlers(self):
         signal.signal(signal.SIGTERM, self.schedule_shutdown)
@@ -194,6 +194,9 @@ def add_child(self, signum, frame):
         self.add_minion()
 
     def register_khan(self):
+        if not hasattr(self, 'resq'):
+            self.setup_resq()
+        
         self.resq.redis.sadd('resque:khans',str(self))
         self.started = datetime.datetime.now()
 
@@ -245,13 +248,7 @@ def _remove_minion(self, pid=None):
         m.terminate()
         return m
 
-    def register_worker(self):
-        logging.debug('registering khan')
-        #self.resq.redis.sadd('resque:khans',str(self))
-        #self.resq._redis.add("worker:#{self}:started", Time.now.to_s)
-        #self.started = datetime.datetime.now()
-    
-    def unregister_worker(self):
+    def unregister_khan(self):
         logging.debug('unregistering khan')
         self.resq.redis.srem('resque:khans',str(self))
         self.started = None
@@ -264,6 +261,7 @@ def work(self, interval=2):
             self._workers[m.pid] = m
             logging.info('minion added at %s' % m.pid)
         self.setup_resq()
+        self.register_khan()
         while True:
             self._check_commands()
             if self._shutdown:
@@ -273,7 +271,7 @@ def work(self, interval=2):
             #get job
             else:
                 time.sleep(interval)
-        self.unregister_worker()
+        self.unregister_khan()
 
     def __str__(self):
         hostname = os.uname()[1]

tests/test_horde.py

@@ -7,11 +7,9 @@ def test_khan_init(self):
         from pyres.exceptions import NoQueueError
         self.assertRaises(NoQueueError, horde.Khan, 2, [])
         self.assertRaises(ValueError, horde.Khan, 'test', ['test'])
-        self.assertRaises(Exception, horde.Khan, 2, ['test'], TestProcess)
 
-    def test_register_worker(self):
+    def test_register_khan(self):
         khan = horde.Khan(pool_size=1, queues=['basic'])
-        khan.startup()
+        khan.register_khan()
         name = "%s:%s" % (os.uname()[1],os.getpid())
-        assert khan.started
         assert self.redis.sismember('resque:khans',name)