Merge branch 'proctitle'

Author: Matt George

pyres/worker.py

@@ -1,13 +1,18 @@
 from pyres.exceptions import NoQueueError
 from pyres.job import Job
-from pyres import ResQ, Stat
+from pyres import ResQ, Stat, __version__
 import logging
 import signal
 import datetime, time
 import os, sys
 import time
 import json_parser as json
 import commands
+try:
+    from setproctitle import setproctitle
+except:
+    def setproctitle(name):
+        pass
 
 class Worker(object):
     """Defines a worker. The ``pyres_worker`` script instantiates this Worker class and
@@ -117,6 +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')
         self.startup()
         while True:
             if self._shutdown:
@@ -128,6 +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()))
                     logging.info('Forked %s at %s' % (self.child, datetime.datetime.now()))
                     try:
                         os.waitpid(self.child, 0)
@@ -138,13 +145,16 @@ 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()))
                     logging.info('Processing %s since %s' % (job._queue, datetime.datetime.now()))
                     self.process(job)
                     os._exit(0)
                 self.child = None
             else:
                 if interval == 0:
                     break
+                #procline @paused ? "Paused" : "Waiting for #{@queues.join(',')}"
+                setproctitle("pyres-%s: Waiting for %s " % (__version__, ','.join(self.queues)))
                 time.sleep(interval)
         self.unregister_worker()
 

requirements.txt

@@ -1,4 +1,5 @@
 simplejson==2.0.9
 itty==0.6.2
 redis==1.34.1
-pystache==0.1.0
+pystache==0.1.0
+setproctitle==1.0

setup.py

@@ -23,7 +23,8 @@
         'simplejson>=2.0.9',
         'itty>=0.6.2',
         'redis==1.34.1',
-        'pystache>=0.1.0'
+        'pystache>=0.1.0',
+        'setproctitle==1.0'
     ],
     classifiers = [
             'Development Status :: 4 - Beta',