Skip to content

Commit

Permalink
worker: reduce some logging levels
Browse files Browse the repository at this point in the history
sbourdeauducq committed Oct 29, 2015
1 parent c0e040c commit 32c95f2
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions artiq/master/worker.py
Original file line number Diff line number Diff line change
@@ -92,8 +92,8 @@ async def close(self, term_timeout=1.0):
try:
await self._send(obj, cancellable=False)
except:
logger.warning("failed to send terminate command to worker"
" (RID %s), killing", self.rid, exc_info=True)
logger.debug("failed to send terminate command to worker"
" (RID %s), killing", self.rid, exc_info=True)
try:
self.process.kill()
except ProcessLookupError:
@@ -103,14 +103,15 @@ async def close(self, term_timeout=1.0):
try:
await asyncio.wait_for(self.process.wait(), term_timeout)
except asyncio.TimeoutError:
logger.warning("worker did not exit (RID %s), killing", self.rid)
logger.debug("worker did not exit by itself (RID %s), killing",
self.rid)
try:
self.process.kill()
except ProcessLookupError:
pass
await self.process.wait()
else:
logger.debug("worker exited gracefully (RID %s)", self.rid)
logger.debug("worker exited by itself (RID %s)", self.rid)
finally:
self.io_lock.release()

0 comments on commit 32c95f2

Please sign in to comment.