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

ctlmgr: fix the fix (107e2fe)

This commit is contained in:
Robert Jördens 2016-01-29 17:52:12 -07:00
parent d05d720b19
commit 17ac64a65e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/devices/ctlmgr.py
View File

@ -41,14 +41,14 @@ class Controller:
try: try:
targets, _ = remote.get_rpc_id() targets, _ = remote.get_rpc_id()
remote.select_rpc_target(targets[0]) remote.select_rpc_target(targets[0])
r = await getattr(remote, method)() r = await getattr(remote, method)(*args, **kwargs)
finally: finally:
remote.close_rpc() remote.close_rpc()
return r return r
async def _ping(self): async def _ping(self):
try: try:
ok = await asyncio.wait_for(self._call_controller("ping"), ok = await asyncio.wait_for(self.call("ping"),
self.ping_timeout) self.ping_timeout)
if ok: if ok:
self.retry_timer_cur = self.retry_timer self.retry_timer_cur = self.retry_timer