From 0f4b4cda03031b4622d70716500da48d816ef35c Mon Sep 17 00:00:00 2001 From: Ryan Herbst Date: Tue, 6 Feb 2024 13:46:41 -0800 Subject: [PATCH 1/2] Fix suggested default address. Fix broken address/port lookup --- docs/src/migration/rogue_v6.rst | 2 +- python/pyrogue/interfaces/_ZmqServer.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/src/migration/rogue_v6.rst b/docs/src/migration/rogue_v6.rst index 5c61f0c91..68a77b19b 100644 --- a/docs/src/migration/rogue_v6.rst +++ b/docs/src/migration/rogue_v6.rst @@ -24,7 +24,7 @@ Similiarly the previous feature which allowed the user to pass the root class to pollEn=True) # Add zmq server, keep it as an attribute so we can access it later - self.zmqServer = pyrogue.interfaces.ZmqServer(root=self, addr='*', port=0) + self.zmqServer = pyrogue.interfaces.ZmqServer(root=self, addr='127.0.0.1', port=0) self.addInterface(self.zmqServer) with ExampleRoot() as root: diff --git a/python/pyrogue/interfaces/_ZmqServer.py b/python/pyrogue/interfaces/_ZmqServer.py index 6f8b0246d..5fcf76422 100644 --- a/python/pyrogue/interfaces/_ZmqServer.py +++ b/python/pyrogue/interfaces/_ZmqServer.py @@ -20,12 +20,16 @@ class ZmqServer(rogue.interfaces.ZmqServer): def __init__(self,*,root,addr,port,incGroups=None, excGroups=['NoServe']): rogue.interfaces.ZmqServer.__init__(self,addr,port) self._root = root + self._addr = addr self._root.addVarListener(func=self._varUpdate, done=self._varDone, incGroups=incGroups, excGroups=excGroups) self._updateList = {} @property def address(self): - return f"localhost:{self.port()}" + if self._addr == "*": + return f"127.0.0.1:{self.port()}" + else: + return f"{self._addr}:{self.port()}" def _doOperation(self,d): path = d['path'] if 'path' in d else None From 8563cb4b59e4e8a8a175a06e742e05102ea91b4c Mon Sep 17 00:00:00 2001 From: Ryan Herbst Date: Tue, 6 Feb 2024 14:00:41 -0800 Subject: [PATCH 2/2] Update the example root to use localhost --- python/pyrogue/examples/_ExampleRoot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyrogue/examples/_ExampleRoot.py b/python/pyrogue/examples/_ExampleRoot.py index 36357b3e3..89a6cfbc3 100755 --- a/python/pyrogue/examples/_ExampleRoot.py +++ b/python/pyrogue/examples/_ExampleRoot.py @@ -73,7 +73,7 @@ def __init__(self, epics4En=False): self.add(pyrogue.RunControl()) # Add zmq server - self.zmqServer = pyrogue.interfaces.ZmqServer(root=self, addr='*', port=0) + self.zmqServer = pyrogue.interfaces.ZmqServer(root=self, addr='127.0.0.1', port=0) self.addInterface(self.zmqServer) # Add sql logger