# HG changeset patch # User jfp <jf.pieronne@laposte.net> # Date 1701706197 -3600 # Mon Dec 04 17:09:57 2023 +0100 # Node ID 04270e90222655588942edd0f8f62047dd893537 # Parent bbc34a7795e4ca8acebca18b775875b9bab71196 Fix pid hex value if node is not in a cluster diff --git a/supervisorvms/supervisord.py b/supervisorvms/supervisord.py --- a/supervisorvms/supervisord.py +++ b/supervisorvms/supervisord.py @@ -451,7 +451,7 @@ ) lib.set_logical( self.process_name + b"_PID", - hex(pid)[2:].upper(), + f'{pid:08X}', supervisord_table_name, ) lib.set_logical( @@ -485,7 +485,7 @@ pass logging.info( - f"Process {self.process_name.decode()} created {hex(pid)[2:].upper()}" + f"Process {self.process_name.decode()} created {pid:08X}" ) def kill(self): @@ -700,7 +700,7 @@ lst.append( [ pgm.process_name.decode("ascii"), - hex(pgm.process.pid)[2:].upper(), + f"{pgm.process.pid:08X}", str(pgm.process.start_time)[:19], pgm.process.state, ] @@ -733,7 +733,7 @@ print(acc) logging.info( f"Program {pgm.name} " - f"terminated {hex(pid)[2:].upper()}, " + f"terminated {pid:08X}, " f"{acc.acc_l_finalsts & 0xEFFFFFFF}" ) pgm.set_terminated(acc.acc_l_finalsts, acc.acc_q_termtime) @@ -873,7 +873,7 @@ ) lib.set_logical( b"SUPERVISORD" + b"_PID", - hex(pid)[2:].upper(), + f"{pid:08X}", supervisord_table_name, ) starlet.wake(pid) @@ -941,7 +941,7 @@ if pid is None: print("Unable to start supervisord daemon") else: - print(f"Daemon started {hex(pid)[2:].upper()}") + print(f"Daemon started {pid:08X}") exit(0) logfile = config["supervisord"].get("logfile", "supervisord.log")