Make absolutely sure the scheduler doesn't run, remove convoluted code
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user