fixing issues that showed up in testing

Author: Matt George

pyres/horde.py

@@ -196,7 +196,8 @@ def __init__(self, pool_size=5, queues=[], server='localhost:6379', password=Non
         #self._workers = list()
 
     def setup_resq(self):
-        self.logger.info('Connecting to redis server - %s' % self.server)
+        if hasattr(self,'logger'):
+            self.logger.info('Connecting to redis server - %s' % self.server)
         if isinstance(self.server,basestring):
             self.resq = ResQ(server=self.server, password=self.password)
         elif isinstance(self.server, ResQ):
@@ -297,19 +298,24 @@ def _remove_minion(self, pid=None):
         return m
 
     def unregister_khan(self):
-        self.logger.debug('unregistering khan')
+        if hasattr(self,'logger'):
+            self.logger.debug('unregistering khan')
         self.resq.redis.srem('resque:khans',str(self))
         self.started = None
 
     def setup_minions(self):
         for i in range(self.pool_size):
             self._add_minion()
 
+    def _setup_logging(self):
+        self.logger = setup_logging('khan', self.logging_level, self.log_file)
+    
     def work(self, interval=2):
         setproctitle('pyres_manager: Starting')
         self.startup()
         self.setup_minions()
-        self.logger = setup_logging('khan', self.logging_level, self.log_file)
+        #self.logger = setup_logging('khan', self.logging_level, self.log_file)
+        self._setup_logging()
         self.logger.info('Running as pid: %s' % self.pid)
         self.logger.info('Added %s child processes' % self.pool_size)
         self.logger.info('Setting up pyres connection')