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

fix issue #1890: make dashboard use moninj port from device_db 

Signed-off-by: Laurent Stephenson <laurent.stephenson@nist.gov>
This commit is contained in:
Laurent Stephenson 2022-05-12 15:13:46 -06:00 committed by Sébastien Bourdeauducq
parent 8a7af3f75c
commit 16393efa7c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/dashboard/moninj.py
View File

@ -203,6 +203,7 @@ _WidgetDesc = namedtuple("_WidgetDesc", "uid comment cls arguments")
def setup_from_ddb(ddb): def setup_from_ddb(ddb):
mi_addr = None mi_addr = None
mi_port = None
dds_sysclk = None dds_sysclk = None
description = set() description = set()
@ -235,14 +236,16 @@ def setup_from_ddb(ddb):
description.add(widget) description.add(widget)
elif v["type"] == "controller" and k == "core_moninj": elif v["type"] == "controller" and k == "core_moninj":
mi_addr = v["host"] mi_addr = v["host"]
mi_port = v.get("port_proxy", 1383)
except KeyError: except KeyError:
pass pass
return mi_addr, dds_sysclk, description return mi_addr, mi_port, dds_sysclk, description
class _DeviceManager: class _DeviceManager:
def __init__(self): def __init__(self):
self.mi_addr = None self.mi_addr = None
self.mi_port = None
self.reconnect_mi = asyncio.Event() self.reconnect_mi = asyncio.Event()
self.mi_connection = None self.mi_connection = None
self.mi_connector_task = asyncio.ensure_future(self.mi_connector()) self.mi_connector_task = asyncio.ensure_future(self.mi_connector())
@ -264,10 +267,11 @@ class _DeviceManager:
return ddb return ddb
def notify(self, mod): def notify(self, mod):
mi_addr, dds_sysclk, description = setup_from_ddb(self.ddb) mi_addr, mi_port, dds_sysclk, description = setup_from_ddb(self.ddb)
if mi_addr != self.mi_addr: if (mi_addr, mi_port) != (self.mi_addr, self.mi_port):
self.mi_addr = mi_addr self.mi_addr = mi_addr
self.mi_port = mi_port
self.reconnect_mi.set() self.reconnect_mi.set()
self.dds_sysclk = dds_sysclk self.dds_sysclk = dds_sysclk
@ -397,7 +401,7 @@ class _DeviceManager:
new_mi_connection = CommMonInj(self.monitor_cb, self.injection_status_cb, new_mi_connection = CommMonInj(self.monitor_cb, self.injection_status_cb,
self.disconnect_cb) self.disconnect_cb)
try: try:
await new_mi_connection.connect(self.mi_addr, 1383) await new_mi_connection.connect(self.mi_addr, self.mi_port)
except asyncio.CancelledError: except asyncio.CancelledError:
logger.info("cancelled connection to moninj") logger.info("cancelled connection to moninj")
break break