--- a/src/pyams_scheduler/task.py Sun Feb 18 15:30:56 2018 +0100
+++ b/src/pyams_scheduler/task.py Mon Mar 05 12:30:32 2018 +0100
@@ -9,7 +9,6 @@
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
#
-from pyramid.threadlocal import RequestContext
__docformat__ = 'restructuredtext'
@@ -24,8 +23,8 @@
from io import StringIO
# import interfaces
-from pyams_scheduler.interfaces import ITaskHistory, ITask, ITaskHistoryContainer, ITaskSchedulingMode, IScheduler, \
- SCHEDULER_HANDLER_KEY, AfterRunJobEvent, SCHEDULER_NAME, BeforeRunJobEvent, ITaskInfo
+from pyams_scheduler.interfaces import IScheduler, ITask, ITaskInfo, ITaskHistory, ITaskHistoryContainer, \
+ ITaskSchedulingMode, SCHEDULER_NAME, SCHEDULER_HANDLER_KEY, SCHEDULER_AUTH_KEY, AfterRunJobEvent, BeforeRunJobEvent
from pyams_utils.interfaces import PYAMS_APPLICATION_DEFAULT_NAME, PYAMS_APPLICATION_SETTINGS_KEY
from pyramid_mailer.interfaces import IMailer
from transaction.interfaces import ITransactionManager
@@ -47,6 +46,7 @@
from pyams_utils.zodb import ZODBConnection
from pyams_zmq.socket import zmq_socket, zmq_response
from pyramid.events import subscriber
+from pyramid.threadlocal import RequestContext
from pyramid_mailer.message import Message
from zope.container.contained import Contained
from zope.container.folder import Folder
@@ -199,7 +199,7 @@
'task_name': self.__name__,
'job_id': kwargs.get('job_id')}
logger.debug("Resetting task {0.name} with {1!r}".format(self, zmq_settings))
- socket = zmq_socket(handler)
+ socket = zmq_socket(handler, auth=request.registry.settings.get(SCHEDULER_AUTH_KEY))
socket.send_json(['reset_task', zmq_settings])
zmq_response(socket)
@@ -224,7 +224,7 @@
'task_name': self.__name__,
'job_id': kwargs.get('job_id')}
logger.debug("Running task {0.name} with {1!r}".format(self, zmq_settings))
- socket = zmq_socket(handler)
+ socket = zmq_socket(handler, auth=request.registry.settings.get(SCHEDULER_AUTH_KEY))
socket.send_json(['run_task', zmq_settings])
zmq_response(socket)
@@ -377,6 +377,6 @@
'task_name': task.__name__,
'job_id': task.internal_id}
logger.debug("Removing task {0.name} with {1!r}".format(task, zmq_settings))
- socket = zmq_socket(handler)
+ socket = zmq_socket(handler, auth=request.registry.settings.get(SCHEDULER_AUTH_KEY))
socket.send_json(['remove_task', zmq_settings])
zmq_response(socket)