Re-factoring to fully disentangle data and app drops

ICRAR · Feb 1, 2023 · 7c29232 · 7c29232
1 parent f6f1f80
commit 7c29232
Show file tree

Hide file tree

Showing 42 changed files with 2,176 additions and 1,663 deletions.
diff --git a/daliuge-common/dlg/common/network.py b/daliuge-common/dlg/common/network.py
@@ -76,13 +76,13 @@ def check_port(host, port, timeout=0, checking_open=True, return_socket=False):
                 s.connect((host, port))
                 if not return_socket:
                     s.close()
-            except (OSError, socket.error):
-                if socket.error:
-                    s.close()
-                    raise
-                elif OSError:
-                    logger.error("Unable to connect to %s:%s", host, port)
-                    return not checking_open
+            except socket.error as e:
+                s.close()
+                raise
+            except OSError as e:
+                # logger.debug("Error opening connection!!")
+                logger.error("Unable to connect to %s:%s", host, port)
+                return not checking_open
 
             # Success if we were checking for an open port!
             if checking_open: