Skip to content

Commit

Permalink
worker: remove useless process wait
Browse files Browse the repository at this point in the history
sbourdeauducq committed Jun 4, 2015
1 parent 50a6da9 commit c843c35
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions artiq/master/worker.py
Original file line number Diff line number Diff line change
@@ -101,17 +101,13 @@ def close(self):
logger.warning("failed to send terminate command to worker"
" (RID %d), killing", self.rid, exc_info=True)
self.process.kill()
# Wait for process to terminate
yield from self.process.communicate()
return
try:
yield from asyncio_process_wait_timeout(self.process,
self.term_timeout)
except asyncio.TimeoutError:
logger.warning("worker did not exit (RID %d), killing", self.rid)
self.process.kill()
# Wait for process to terminate
yield from self.process.communicate()
else:
logger.debug("worker exited gracefully (RID %d)", self.rid)
finally:

0 comments on commit c843c35

Please sign in to comment.