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

ctlmgr: use workaround for asyncio.wait_for(process.wait()... Python bug

This commit is contained in:
Sebastien Bourdeauducq 2015-03-11 16:48:16 +01:00
parent d5795fd619
commit 5ca4821a29
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artiq/frontend/artiq_ctlmgr.py
View File

@ -10,6 +10,7 @@ import socket
from artiq.protocols.sync_struct import Subscriber from artiq.protocols.sync_struct import Subscriber
from artiq.tools import verbosity_args, init_logger from artiq.tools import verbosity_args, init_logger
from artiq.tools import asyncio_process_wait_timeout
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -65,7 +66,7 @@ class Controller:
process.send_signal(signal.SIGTERM) process.send_signal(signal.SIGTERM)
logger.debug("Signal sent") logger.debug("Signal sent")
try: try:
yield from asyncio.wait_for(process.wait(), timeout=5.0) yield from asyncio_process_wait_timeout(process, 5.0)
except asyncio.TimeoutError: except asyncio.TimeoutError:
logger.warning("Controller %s did not respond to SIGTERM", logger.warning("Controller %s did not respond to SIGTERM",
name) name)