From 17ac64a65edd33af3c66dabed179338584a16e26 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Fri, 29 Jan 2016 17:52:12 -0700 Subject: [PATCH] ctlmgr: fix the fix (107e2fe) --- artiq/devices/ctlmgr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/artiq/devices/ctlmgr.py b/artiq/devices/ctlmgr.py index 93b00db04..83295cf69 100644 --- a/artiq/devices/ctlmgr.py +++ b/artiq/devices/ctlmgr.py @@ -41,14 +41,14 @@ class Controller: try: targets, _ = remote.get_rpc_id() remote.select_rpc_target(targets[0]) - r = await getattr(remote, method)() + r = await getattr(remote, method)(*args, **kwargs) finally: remote.close_rpc() return r async def _ping(self): try: - ok = await asyncio.wait_for(self._call_controller("ping"), + ok = await asyncio.wait_for(self.call("ping"), self.ping_timeout) if ok: self.retry_timer_cur = self.retry_timer