Update session name in opmon configuration

Author: emmuhamm

src/drunc/process_manager/configuration.py

@@ -51,7 +51,8 @@ def __init__(self):
 
 
 class ProcessManagerConfHandler(ConfHandler):
-    def __init__(self, log_path: str, *args, **kwargs):
+    def __init__(self, log_path: str, drunc_session: str, *args, **kwargs):
+        self.drunc_session = drunc_session
         super().__init__(*args, **kwargs)
         self.log_path = log_path
         self.log = get_logger("process_manager.conf_handler")
@@ -86,7 +87,7 @@ def _parse_dict(self, data):
             log=self.log,
             conf=data.get("opmon_conf", None),
             uri=data.get("opmon_uri", None),
-            session=new_data.type.name,
+            session=self.drunc_session,
             application="process_manager",
         )
 

src/drunc/process_manager/interface/process_manager.py

@@ -39,6 +39,7 @@ def run_pm(
     pm_address: str,
     log_level: str,
     override_logs: bool,
+    drunc_session: str,
     log_path: str = None,
     ready_event: bool = None,
     signal_handler: bool = None,
@@ -62,7 +63,10 @@ def run_pm(
     conf_path, conf_type = parse_conf_url(pm_conf)
 
     pmch = ProcessManagerConfHandler(
-        log_path=log_path, type=conf_type, data=conf_path.split(":")[1]
+        log_path=log_path,
+        type=conf_type,
+        data=conf_path.split(":")[1],
+        drunc_session=drunc_session,
     )
 
     log_path = get_log_path(
@@ -194,4 +198,5 @@ def process_manager_cli(
         log_level=log_level,
         override_logs=override_logs,
         log_path=log_path,
+        drunc_session="No-session-pm-cli",
     )

src/drunc/process_manager/utils.py

@@ -348,7 +348,10 @@ def get_pm_type_from_name(pm_name: str) -> ProcessManagerTypes:
 
     conf_path, conf_type = parse_conf_url(pm_conf_file)
     pmch = ProcessManagerConfHandler(
-        log_path="./", type=conf_type, data=conf_path.split(":")[1]
+        log_path="./",
+        type=conf_type,
+        data=conf_path.split(":")[1],
+        drunc_session="No-session",
     )
 
     return pmch.data.type

src/drunc/unified_shell/shell.py

@@ -206,7 +206,9 @@ def unified_shell(
             sys.exit(1)
 
         # Start the process manager as a separate process
-        ctx.obj.log.info("Starting process manager")
+        ctx.obj.log.info(
+            f"Starting process manager with session name {ctx.obj.session_name}"
+        )
         ready_event = mp.Event()
         port = mp.Value("i", 0)
 
@@ -224,6 +226,7 @@ def unified_shell(
                 "signal_handler": ignore_sigint_sighandler,
                 # sigint gets sent to the PM, so we need to ignore it, otherwise everytime the user ctrl-c on the shell, the PM goes down
                 "generated_port": port,
+                "drunc_session": ctx.obj.session_name,
             },
         )
         ctx.obj.pm_process.start()