M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

worker: remove useless process wait

This commit is contained in:
Sebastien Bourdeauducq 2015-06-05 00:05:38 +08:00
parent 50a6da994e
commit c843c353d7
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/master/worker.py
View File

@ -101,8 +101,6 @@ class Worker:
logger.warning("failed to send terminate command to worker" logger.warning("failed to send terminate command to worker"
" (RID %d), killing", self.rid, exc_info=True) " (RID %d), killing", self.rid, exc_info=True)
self.process.kill() self.process.kill()
# Wait for process to terminate
yield from self.process.communicate()
return return
try: try:
yield from asyncio_process_wait_timeout(self.process, yield from asyncio_process_wait_timeout(self.process,
@ -110,8 +108,6 @@ class Worker:
except asyncio.TimeoutError: except asyncio.TimeoutError:
logger.warning("worker did not exit (RID %d), killing", self.rid) logger.warning("worker did not exit (RID %d), killing", self.rid)
self.process.kill() self.process.kill()
# Wait for process to terminate
yield from self.process.communicate()
else: else:
logger.debug("worker exited gracefully (RID %d)", self.rid) logger.debug("worker exited gracefully (RID %d)", self.rid)
finally: finally: