From 1a09c4c987479e31d9f1cc41623e72d230ea96d6 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 18 Jul 2014 19:56:50 -0400 Subject: [PATCH] Make absolutely sure the scheduler doesn't run, remove convoluted code --- mayan/apps/scheduler/__init__.py | 13 ++----------- mayan/apps/scheduler/runtime.py | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/mayan/apps/scheduler/__init__.py b/mayan/apps/scheduler/__init__.py index c4af634dc0..742fb3c9a5 100644 --- a/mayan/apps/scheduler/__init__.py +++ b/mayan/apps/scheduler/__init__.py @@ -2,13 +2,12 @@ from __future__ import absolute_import import atexit import logging -import sys from project_tools.api import register_tool from .links import job_list -from .literals import SHUTDOWN_COMMANDS -from .runtime import scheduler, lockdown +from .runtime import scheduler +import logging logger = logging.getLogger(__name__) @@ -18,13 +17,5 @@ def schedule_shutdown_on_exit(): scheduler.shutdown() -if any([command in sys.argv for command in SHUTDOWN_COMMANDS]): - logger.debug('Scheduler shut down on SHUTDOWN_COMMAND') - # Shutdown any scheduler already running - scheduler.shutdown() - # Prevent any new scheduler afterwards to start - lockdown() - - atexit.register(schedule_shutdown_on_exit) register_tool(job_list) diff --git a/mayan/apps/scheduler/runtime.py b/mayan/apps/scheduler/runtime.py index 63dbdfa3cd..88046c79e8 100644 --- a/mayan/apps/scheduler/runtime.py +++ b/mayan/apps/scheduler/runtime.py @@ -1,13 +1,17 @@ +from __future__ import absolute_import + +import sys +import logging + from apscheduler.scheduler import Scheduler -_lockdown = False +from .literals import SHUTDOWN_COMMANDS + +logger = logging.getLogger(__name__) scheduler = Scheduler() - -def lockdown(): - global _lockdown - _lockdown = True - - -if not _lockdown: +if not any([command in sys.argv for command in SHUTDOWN_COMMANDS]): + logger.debug('Starting scheduler') scheduler.start() + +