From 2a617fbaf00df5ff72faeed33fabd83e7f6f35b1 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Tue, 17 Dec 2024 17:08:19 +0100 Subject: [PATCH] make UPD listener work when 'tcp://' is omitted on interface 'tcp://' may be omitted on interfaces add missing 'tcp://' earlier in code, so we do not need to check for missing 'tcp://' again. Change-Id: Ie9b4dbd168aebdb6edfe71dbd2cfc25e9229fe67 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35321 Reviewed-by: Georg Brandl Reviewed-by: Markus Zolliker Tested-by: Jenkins Automated Tests --- frappy/server.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappy/server.py b/frappy/server.py index 1d4a34c..6334d98 100644 --- a/frappy/server.py +++ b/frappy/server.py @@ -176,6 +176,8 @@ class Server: lock = threading.Lock() failed = {} interfaces = [self.node_cfg['interface']] + self.node_cfg.get('secondary', []) + # allow missing "tcp://" + interfaces = [iface if '://' in iface else f'tcp://{iface}' for iface in interfaces] with lock: for interface in interfaces: opts = {'uri': interface} @@ -258,8 +260,7 @@ class Server: def _interfaceThread(self, opts, lock, failed, interfaces, start_cb): iface = opts['uri'] - scheme, _, _ = iface.rpartition('://') - scheme = scheme or 'tcp' + scheme = iface.split('://')[0] cls = get_class(self.INTERFACES[scheme]) try: with cls(scheme, self.log.getChild(scheme), opts, self) as interface: