Move monkey patching to bin/qless-py-worker.

Author: lindseyreno

bin/qless-py-worker

@@ -40,6 +40,22 @@ parser.add_argument('-r', '--resume', default=False, action='store_true',
     help='Try to resume jobs that this worker had previously been working on')
 args = parser.parse_args()
 
+# Build up the kwargs that we'll pass to the worker
+kwargs = {
+    'workers': args.workers,
+    'interval': args.interval,
+    'resume': args.resume
+}
+
+# If we're supposed to use greenlets...
+if args.greenlets:
+    from gevent import monkey
+    monkey.patch_all()
+    kwargs.update({
+        'klass': 'qless.workers.greenlet.GeventWorker',
+        'greenlets': args.greenlets
+    })
+
 import os
 import sys
 import qless
@@ -73,20 +89,6 @@ for module in getattr(args, 'import'):
 # Change path to our working directory
 os.chdir(args.workdir)
 
-# Build up the kwargs that we'll pass to the worker
-kwargs = {
-    'workers': args.workers,
-    'interval': args.interval,
-    'resume': args.resume
-}
-
-# If we're supposed to use greenlets...
-if args.greenlets:
-    kwargs.update({
-        'klass': 'qless.workers.greenlet.GeventWorker',
-        'greenlets': args.greenlets
-    })
-
 # And now run the worker
 ForkingWorker(
     args.queue, qless.Client(args.host, hostname=args.name), **kwargs).run()

qless/workers/greenlet.py

@@ -44,20 +44,11 @@ def kill(self, jid):
             logger.warn('Lost ownership of %s' % jid)
             greenlet.kill()
 
-    @classmethod
-    def patch(cls):  # pragma: no cover
-        '''Monkey-patch anything that needs to be patched'''
-        from gevent import monkey
-        monkey.patch_all()
-
     def run(self):
         '''Work on jobs'''
         # Register signal handlers
         self.signals()
 
-        # And monkey-patch before doing any imports
-        self.patch()
-
         # Start listening
         with self.listener():
             try:

test/test_worker.py

@@ -20,9 +20,13 @@ def setUp(self):
 
     def test_proctitle(self):
         '''Make sure we can get / set the process title'''
-        before = Worker.title()
-        Worker.title('Foo')
-        self.assertNotEqual(before, Worker.title())
+        try:
+            import setproctitle
+            before = Worker.title()
+            Worker.title('Foo')
+            self.assertNotEqual(before, Worker.title())
+        except ImportError:
+            self.skipTest('setproctitle not available')
 
     def test_kill(self):
         '''The base worker class' kill method should raise an exception'''