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

worker: flake8 style cleanup

This commit is contained in:
Robert Jördens 2016-02-02 15:31:40 -07:00
parent 7636952496
commit 53e5d0a7bb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
artiq/master/worker.py
View File

@ -5,7 +5,6 @@ import logging
import subprocess import subprocess
import traceback import traceback
import time import time
from functools import partial
from artiq.protocols import pipe_ipc, pyon from artiq.protocols import pipe_ipc, pyon
from artiq.protocols.logging import LogParser from artiq.protocols.logging import LogParser
@ -130,12 +129,13 @@ class Worker:
except ProcessLookupError: except ProcessLookupError:
pass pass
try: try:
await asyncio.wait_for(self.ipc.process.wait(), term_timeout) await asyncio.wait_for(self.ipc.process.wait(),
term_timeout)
logger.debug("worker terminated (RID %s)", self.rid) logger.debug("worker terminated (RID %s)", self.rid)
return return
except asyncio.TimeoutError: except asyncio.TimeoutError:
logger.warning("worker did not terminate (RID %s), killing", logger.warning(
self.rid) "worker did not terminate (RID %s), killing", self.rid)
try: try:
self.ipc.process.kill() self.ipc.process.kill()
except ProcessLookupError: except ProcessLookupError:
@ -215,7 +215,8 @@ class Worker:
reply = {"status": "ok", "data": data} reply = {"status": "ok", "data": data}
except Exception as e: except Exception as e:
reply = {"status": "failed", reply = {"status": "failed",
"exception": traceback.format_exception_only(type(e), e)[0][:-1], "exception": traceback.format_exception_only(
type(e), e)[0][:-1],
"message": str(e), "message": str(e),
"traceback": traceback.format_tb(e.__traceback__)} "traceback": traceback.format_tb(e.__traceback__)}
await self.io_lock.acquire() await self.io_lock.acquire()
@ -242,7 +243,8 @@ class Worker:
del self.watchdogs[-1] del self.watchdogs[-1]
return completed return completed
async def build(self, rid, pipeline_name, wd, expid, priority, timeout=15.0): async def build(self, rid, pipeline_name, wd, expid, priority,
timeout=15.0):
self.rid = rid self.rid = rid
self.filename = os.path.basename(expid["file"]) self.filename = os.path.basename(expid["file"])
await self._create_process(expid["log_level"]) await self._create_process(expid["log_level"])
@ -287,6 +289,7 @@ class Worker:
await self._create_process(logging.WARNING) await self._create_process(logging.WARNING)
r = dict() r = dict()
def register(class_name, name, arginfo): def register(class_name, name, arginfo):
r[class_name] = {"name": name, "arginfo": arginfo} r[class_name] = {"name": name, "arginfo": arginfo}
self.register_experiment = register self.register_experiment = register