occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

waveform: consistent log messages

This commit is contained in:
Simon Renblad 2024-03-07 10:40:44 +08:00 committed by Sébastien Bourdeauducq
parent 27178c1478
commit 332c9c0fcd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/dashboard/waveform.py
View File

@ -45,7 +45,7 @@ class ProxyClient():
self.addr = addr self.addr = addr
self.port = port self.port = port
self.port_proxy = port_proxy self.port_proxy = port_proxy
self.reconnect() self._reconnect_event.set()
async def trigger_proxy_task(self): async def trigger_proxy_task(self):
remote = AsyncioClient() remote = AsyncioClient()
@ -72,12 +72,12 @@ class ProxyClient():
await self.receiver.close() await self.receiver.close()
self.receiver = None self.receiver = None
new_receiver = comm_analyzer.AnalyzerProxyReceiver( new_receiver = comm_analyzer.AnalyzerProxyReceiver(
self.receive_cb, self.reconnect) self.receive_cb, self.disconnect_cb)
try: try:
if self.addr is not None: if self.addr is not None:
await asyncio.wait_for(new_receiver.connect(self.addr, self.port_proxy), await asyncio.wait_for(new_receiver.connect(self.addr, self.port_proxy),
self.timeout) self.timeout)
logger.info("connected to analyzer proxy %s:%d", self.addr, self.port_proxy) logger.info("ARTIQ dashboard connected to analyzer proxy (%s)", self.addr)
self.timer_cur = self.timer self.timer_cur = self.timer
self.receiver = new_receiver self.receiver = new_receiver
continue continue
@ -100,7 +100,8 @@ class ProxyClient():
if self.receiver is not None: if self.receiver is not None:
await self.receiver.close() await self.receiver.close()
def reconnect(self): def disconnect_cb(self):
logger.error("lost connection to analyzer proxy")
self._reconnect_event.set() self._reconnect_event.set()