Changed over to a shared context; Creating two contexts is problematic on Ubuntu (currently).

Author: Jason Allum

django_ztask/__init__.py

@@ -8,4 +8,7 @@
 __contact__ = "[email protected]"
 __homepage__ = "http://github.com/dmgctrl/django-ztask"
 __docformat__ = "restructuredtext"
-__license__ = "BSD (3 clause)"
+__license__ = "BSD (3 clause)"
+
+import zmq
+context = zmq.Context()

django_ztask/decorators.py

@@ -12,8 +12,8 @@ def wrapper(func):
         logger = logging.getLogger('ztaskd')
         logger.info('Registered task: %s' % function_name)
 
-        context = zmq.Context()
-        socket = context.socket(zmq.DOWNSTREAM)
+        from django_ztask import context
+        socket = context.socket(zmq.PUSH)
         socket.connect(settings.ZTASKD_URL)
         @wraps(func)
         def _func(*args, **kwargs):

django_ztask/management/commands/ztaskd.py

@@ -2,6 +2,7 @@
 from django.utils import autoreload
 #
 from django_ztask.conf import settings
+from django_ztask import context
 #
 from optparse import make_option
 import sys
@@ -20,20 +21,18 @@ class Command(BaseCommand):
     help = 'Start the ztaskd server'
 
     def handle(self, *args, **options):
-        self._setup_logger(options.get('logfile', None), options.get('loglevel', 'info'))
+        socket = context.socket(zmq.PULL)
+        socket.bind(settings.ZTASKD_URL)
+
         use_reloader = options.get('use_reloader', True)
+        self._setup_logger(options.get('logfile', None), options.get('loglevel', 'info'))
+        self.logger.info("%sServer started on %s." % ('Development ' if use_reloader else '', settings.ZTASKD_URL))
         if use_reloader:
-            autoreload.main(self._handle)
+            autoreload.main(lambda: self._handle(socket))
         else:
-            self._handle()
+            self._handle(socket)
 
-    def _handle(self):
-        context = zmq.Context()
-        socket = context.socket(zmq.UPSTREAM)
-        socket.setsockopt(zmq.HWM, 64)
-        socket.bind(settings.ZTASKD_URL)
-        
-        self.logger.info("ztaskd development server started on %s." % (settings.ZTASKD_URL))
+    def _handle(self, socket):
         cache = {}
         while True:
             function_name = None
@@ -54,7 +53,6 @@ def _handle(self):
                     function = getattr(sys.modules[module_name], member_name)
                     cache[function_name] = function
                 function(*args, **kwargs)
-                self.logger.info('Successfully called %s' % function_name)
             except Exception, e:
                 self.logger.error('Error calling %s. Details:\n%s' % (function_name, e))
                 traceback.print_exc(e)