vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Only start workers once setup is complete on the registry

Browse source 
Fixes #326
This commit is contained in:
Joseph Schorr 2015-08-07 13:14:14 -04:00
parent 14f511bb5a
commit c3d7ef2ec4
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
workers/worker.py
View file

@ -53,8 +53,21 @@ class Worker(object):
self._operations.append((_operation_func, operation_sec)) self._operations.append((_operation_func, operation_sec))
def _setup_and_wait_for_shutdown(self):
signal.signal(signal.SIGTERM, self.terminate)
signal.signal(signal.SIGINT, self.terminate)
while not self._stop.wait(1):
pass
def start(self): def start(self):
logging.config.fileConfig('conf/logging.conf', disable_existing_loggers=False) logging.config.fileConfig('conf/logging.conf', disable_existing_loggers=False)
if not app.config.get('SETUP_COMPLETE', False):
logger.info('Product setup is not yet complete; skipping worker startup')
self._setup_and_wait_for_shutdown()
return
logger.debug('Scheduling worker.') logger.debug('Scheduling worker.')
soon = datetime.now() + timedelta(seconds=.001) soon = datetime.now() + timedelta(seconds=.001)
@ -64,11 +77,8 @@ class Worker(object):
self._sched.add_job(operation_func, 'interval', seconds=operation_sec, self._sched.add_job(operation_func, 'interval', seconds=operation_sec,
start_date=soon, max_instances=1) start_date=soon, max_instances=1)
signal.signal(signal.SIGTERM, self.terminate)
signal.signal(signal.SIGINT, self.terminate)
while not self._stop.wait(1): self._setup_and_wait_for_shutdown()
pass
logger.debug('Waiting for running tasks to complete.') logger.debug('Waiting for running tasks to complete.')
self._sched.shutdown() self._sched.shutdown()