From f9a013f41c7f94868e1a921599b5ef428c8238ec Mon Sep 17 00:00:00 2001
From: Ryan Bunney <ryanbunney@fastmail.com>
Date: Mon, 12 Aug 2024 17:19:56 +0800
Subject: [PATCH] LIU-396: Add additional port options to CLI for NodeManager.

- Can now specify --rpc_port and --event_port.
- Verified this works and two NodeManagers can be run using localhost.
---
 daliuge-engine/dlg/manager/cmdline.py         | 21 +++++++++++++++++++
 .../dlg/manager/composite_manager.py          |  4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/daliuge-engine/dlg/manager/cmdline.py b/daliuge-engine/dlg/manager/cmdline.py
index dc300ef2f..c824310d3 100644
--- a/daliuge-engine/dlg/manager/cmdline.py
+++ b/daliuge-engine/dlg/manager/cmdline.py
@@ -40,6 +40,8 @@
     ISLAND_DEFAULT_REST_PORT,
     MASTER_DEFAULT_REST_PORT,
     REPLAY_DEFAULT_REST_PORT,
+    NODE_DEFAULT_RPC_PORT,
+    NODE_DEFAULT_EVENTS_PORT
 )
 from .node_manager import NodeManager
 from .replay import ReplayManager, ReplayManagerServer
@@ -423,6 +425,23 @@ def dlgNM(parser, args):
         dest="use_processes",
         help="Use processes instead of threads to execute app drops, defaults to False",
     )
+    parser.add_option(
+        "--rpc_port",
+        action="store",
+        type="int",
+        dest="rpc_port",
+        help="Set the port number for the NodeManager RPC client",
+        default=NODE_DEFAULT_RPC_PORT
+    )
+    parser.add_option(
+        "--event_port",
+        action="store",
+        type="int",
+        dest="events_port",
+        help="Set the port number for the NodeManager ZMQ client",
+        default=NODE_DEFAULT_EVENTS_PORT
+    )
+
     (options, args) = parser.parse_args(args)
 
     # No logging setup at this point yet
@@ -445,6 +464,8 @@ def dlgNM(parser, args):
         "dlm_enable_replication": options.dlm_enable_replication,
         "dlgPath": options.dlgPath,
         "host": options.host,
+        "rpc_port": options.rpc_port,
+        "events_port": options.events_port,
         "error_listener": options.errorListener,
         "event_listeners": list(
             filter(None, options.event_listeners.split(":"))
diff --git a/daliuge-engine/dlg/manager/composite_manager.py b/daliuge-engine/dlg/manager/composite_manager.py
index edfc2ce2d..2e2c09005 100644
--- a/daliuge-engine/dlg/manager/composite_manager.py
+++ b/daliuge-engine/dlg/manager/composite_manager.py
@@ -207,8 +207,8 @@ def _checkDM(self):
                     break
                 if not self.check_dm(host, port, timeout=self._dmCheckTimeout):
                     logger.error(
-                        "Couldn't contact manager for host %s, will try again later",
-                        host,
+                        "Couldn't contact manager for host %s:%d, will try again later",
+                        host, port,
                     )
             if self._dmCheckerEvt.wait(60):
                 break