diff -r eaf9751db04a -r 0b31d2492f15 src/pyams_scheduler/process.py --- a/src/pyams_scheduler/process.py Mon Dec 11 15:26:53 2017 +0100 +++ b/src/pyams_scheduler/process.py Thu Jan 11 17:07:28 2018 +0100 @@ -23,13 +23,12 @@ # import interfaces from pyams_scheduler.interfaces import SCHEDULER_NAME from pyams_utils.interfaces import PYAMS_APPLICATION_SETTINGS_KEY, PYAMS_APPLICATION_DEFAULT_NAME -from pyams_utils.interfaces.zeo import IZEOConnection # import packages from apscheduler.jobstores.memory import MemoryJobStore from apscheduler.schedulers.background import BackgroundScheduler from pyams_scheduler.task import ImmediateTaskTrigger -from pyams_utils.zodb import ZEOConnection +from pyams_utils.zodb import ZODBConnection from pyams_zmq.handler import ZMQMessageHandler from pyams_zmq.process import ZMQProcess @@ -42,10 +41,8 @@ self.settings = settings def _get_connection(self): - zeo_settings = self.settings.get('zeo') - connection = ZEOConnection() - connection.update(zeo_settings) - return connection + zodb_name = self.settings.get('zodb_name') + return ZODBConnection(name=zodb_name) class TaskResettingThread(BaseTaskThread): @@ -63,7 +60,7 @@ if job_id is None: return job_id = str(job_id) - logger.debug("Loading ZEO connection...") + logger.debug("Loading ZODB connection...") with self._get_connection() as root: logger.debug("Loaded ZODB root {0!r}".format(root)) try: @@ -86,12 +83,11 @@ if task is not None: trigger = task.get_trigger(self.process.registry) logger.debug("Getting task trigger {0!r}".format(trigger)) - zeo_connection = sm.getUtility(IZEOConnection, name=scheduler_util.zeo_connection) logger.debug("Adding new job to scheduler {0!r}".format(scheduler)) scheduler.add_job(task, trigger, id=str(task.internal_id), name=task.name, - kwargs={'zeo_settings': zeo_connection.get_settings(), + kwargs={'zodb_name': scheduler_util.zodb_name, 'registry': self.process.registry}) logger.debug("Added job") except: @@ -108,7 +104,7 @@ if job_id is None: return job_id = str(job_id) - logger.debug("Loading ZEO connection...") + logger.debug("Loading ZODB connection...") with self._get_connection() as root: logger.debug("Loaded ZODB root {0!r}".format(root)) try: @@ -139,7 +135,7 @@ job_id = settings.get('job_id') if job_id is None: return - logger.debug("Loading ZEO connection...") + logger.debug("Loading ZODB connection...") with self._get_connection() as root: logger.debug("Loaded ZODB root {0!r}".format(root)) try: @@ -157,13 +153,12 @@ if task is not None: trigger = ImmediateTaskTrigger() logger.debug("Getting task trigger {0!r}".format(trigger)) - zeo_connection = sm.getUtility(IZEOConnection, name=scheduler_util.zeo_connection) logger.debug("Adding new job to scheduler {0!r}".format(scheduler)) scheduler.add_job(task, trigger, id='{0.internal_id}::{1}'.format(task, datetime.utcnow().isoformat()), name=task.name, - kwargs={'zeo_settings': zeo_connection.get_settings(), + kwargs={'zodb_name': scheduler_util.zodb_name, 'registry': self.process.registry, 'run_immediate': True}) logger.debug("Added job")