adding and updating setproctitle usage.

Updated the usage in worker and added to horde.

Author: Matt George

pyres/horde.py

@@ -13,6 +13,11 @@
 from pyres.utils import OrderedDict
 from pyres.job import Job
 import pyres.json_parser as json
+try:
+    from setproctitle import setproctitle
+except:
+    def setproctitle(name):
+        pass
 
 def setup_logging(namespace='', log_level=logging.INFO, log_file=None):
 
@@ -52,6 +57,8 @@ def prune_dead_workers(self):
         pass
 
     def schedule_shutdown(self, signum, frame):
+        print signum,
+        print 'inside shutdown'
         self._shutdown = True
 
     def register_signal_handlers(self):
@@ -97,6 +104,7 @@ def process(self, job):
             self.done_working()
 
     def working_on(self, job):
+        setproctitle('pyres_minion:%s: working on job: %s' % (os.getppid(), job._payload))
         self.logger.debug('marking as working on')
         data = {
             'queue': job._queue,
@@ -128,6 +136,8 @@ def work(self, interval=5):
 
         self.startup()
         while True:
+            setproctitle('pyres_minion:%s: waiting for job on: %s' % (os.getppid(),self.queues))
+            self.logger.info('waiting on job')
             if self._shutdown:
                 self.logger.info('shutdown scheduled')
                 break
@@ -139,7 +149,7 @@ def work(self, interval=5):
         self.unregister_minion()
 
     def run(self):
-        
+        setproctitle('pyres_minion:%s: Starting' % (os.getppid(),))
         if isinstance(self.server,basestring):
             self.resq = ResQ(server=self.server, password=self.password)
         elif isinstance(self.server, ResQ):
@@ -257,6 +267,7 @@ def _shutdown_minions(self):
         """
         send the SIGNINT signal to each worker in the pool.
         """
+        setproctitle('pyres_manager: Waiting on children to shutdown.')
         for minion in self._workers.values():
             minion.terminate()
             minion.join()
@@ -281,10 +292,12 @@ def setup_minions(self):
             self._add_minion()
 
     def work(self, interval=2):
+        setproctitle('pyres_manager: Starting')
         self.startup()
         self.setup_minions()
         self.setup_resq()
         self.register_khan()
+        setproctitle('pyres_manager: running')
         while True:
             self._check_commands()
             if self._shutdown:

pyres/worker.py

@@ -122,7 +122,7 @@ def work(self, interval=5):
         Finally, the ``process`` method actually processes the job by eventually calling the Job instance's ``perform`` method.
         
         """
-        setproctitle('pyres: Starting')
+        setproctitle('pyres_worker-%s: Starting' % __version__)
         self.startup()
         while True:
             if self._shutdown:
@@ -134,7 +134,7 @@ def work(self, interval=5):
                 logging.debug('job details: %s' % job)
                 self.child = os.fork()
                 if self.child:
-                    setproctitle("pyres-%s: Forked %s at %s" % (__version__, self.child, datetime.datetime.now()))
+                    setproctitle("pyres_worker%s: Forked %s at %s" % (__version__, self.child, datetime.datetime.now()))
                     logging.info('Forked %s at %s' % (self.child, datetime.datetime.now()))
                     try:
                         os.waitpid(self.child, 0)
@@ -145,7 +145,7 @@ def work(self, interval=5):
                     #os.wait()
                     logging.debug('done waiting')
                 else:
-                    setproctitle("pyres-%s: Processing %s since %s" % (__version__, job._queue, datetime.datetime.now()))
+                    setproctitle("pyres_worker-%s: Processing %s since %s" % (__version__, job._queue, datetime.datetime.now()))
                     logging.info('Processing %s since %s' % (job._queue, datetime.datetime.now()))
                     self.process(job)
                     os._exit(0)
@@ -154,7 +154,7 @@ def work(self, interval=5):
                 if interval == 0:
                     break
                 #procline @paused ? "Paused" : "Waiting for #{@queues.join(',')}"
-                setproctitle("pyres-%s: Waiting for %s " % (__version__, ','.join(self.queues)))
+                setproctitle("pyres_worker-%s: Waiting for %s " % (__version__, ','.join(self.queues)))
                 time.sleep(interval)
         self.unregister_worker()