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

Allow the buildman server to die if an uncaught exception terminates the scheduler process.

Browse source
This commit is contained in:
Jake Moshenko 2015-01-29 10:56:57 -05:00
parent c308794063
commit 2e86417329
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
buildman/server.py
View file

@ -76,12 +76,11 @@ class BuilderServer(object):
logger.debug('Initializing all members of the event loop') logger.debug('Initializing all members of the event loop')
loop = trollius.get_event_loop() loop = trollius.get_event_loop()
trollius.Task(self._initialize(loop, host, websocket_port, controller_port, ssl))
logger.debug('Starting server on port %s, with controller on port %s', websocket_port, logger.debug('Starting server on port %s, with controller on port %s', websocket_port,
controller_port) controller_port)
try: try:
loop.run_forever() loop.run_until_complete(self._initialize(loop, host, websocket_port, controller_port, ssl))
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
finally: finally:
@ -163,8 +162,6 @@ class BuilderServer(object):
logger.debug('All workers are busy. Requeuing.') logger.debug('All workers are busy. Requeuing.')
self._queue.incomplete(job_item, restore_retry=True, retry_after=0) self._queue.incomplete(job_item, restore_retry=True, retry_after=0)
yield From(trollius.sleep(WORK_CHECK_TIMEOUT))
@trollius.coroutine @trollius.coroutine
def _initialize(self, loop, host, websocket_port, controller_port, ssl=None): def _initialize(self, loop, host, websocket_port, controller_port, ssl=None):
self._loop = loop self._loop = loop