--- a/src/pyams_scheduler/zmi/scheduler.py Thu Aug 27 11:41:00 2015 +0200
+++ b/src/pyams_scheduler/zmi/scheduler.py Thu Aug 27 11:41:56 2015 +0200
@@ -32,7 +32,6 @@
from zope.component.interfaces import ISite
# import packages
-import zmq
from pyams_form.form import AJAXEditForm
from pyams_pagelet.pagelet import pagelet_config
from pyams_skin.container import ContainerView
@@ -49,6 +48,7 @@
from pyams_viewlet.viewlet import viewlet_config, Viewlet
from pyams_zmi.form import AdminDialogEditForm, AdminDialogDisplayForm
from pyams_zmi.view import AdminView
+from pyams_zmq.socket import zmq_socket, zmq_response
from pyramid.url import resource_url
from pyramid.view import view_config
from z3c.form import field
@@ -79,7 +79,7 @@
"""Scheduler menu"""
label = _("Tasks scheduler")
- icon_class = 'fa fa-fw fa-clock-o'
+ icon_class = 'fa-clock-o'
url = '#scheduler-tasks.html'
@@ -364,11 +364,13 @@
def values(self):
handler = self.request.registry.settings.get(SCHEDULER_HANDLER_KEY, False)
if handler:
- context = zmq.Context()
- socket = context.socket(zmq.REQ)
- socket.connect('tcp://{0}'.format(handler))
+ socket = zmq_socket(handler)
socket.send_json(['get_jobs', {}])
- return socket.recv_json()
+ status, response = zmq_response(socket)
+ if status == 200:
+ return response
+ else: # error
+ return ()
else:
return ()