Skip to content
Snippets Groups Projects
Commit 04270e902226 authored by jfp's avatar jfp
Browse files

Fix pid hex value if node is not in a cluster

parent bbc34a7795e4
No related branches found
No related tags found
No related merge requests found
...@@ -451,7 +451,7 @@ ...@@ -451,7 +451,7 @@
) )
lib.set_logical( lib.set_logical(
self.process_name + b"_PID", self.process_name + b"_PID",
hex(pid)[2:].upper(), f'{pid:08X}',
supervisord_table_name, supervisord_table_name,
) )
lib.set_logical( lib.set_logical(
...@@ -485,7 +485,7 @@ ...@@ -485,7 +485,7 @@
pass pass
logging.info( 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): def kill(self):
...@@ -700,7 +700,7 @@ ...@@ -700,7 +700,7 @@
lst.append( lst.append(
[ [
pgm.process_name.decode("ascii"), pgm.process_name.decode("ascii"),
hex(pgm.process.pid)[2:].upper(), f"{pgm.process.pid:08X}",
str(pgm.process.start_time)[:19], str(pgm.process.start_time)[:19],
pgm.process.state, pgm.process.state,
] ]
...@@ -733,7 +733,7 @@ ...@@ -733,7 +733,7 @@
print(acc) print(acc)
logging.info( logging.info(
f"Program {pgm.name} " f"Program {pgm.name} "
f"terminated {hex(pid)[2:].upper()}, " f"terminated {pid:08X}, "
f"{acc.acc_l_finalsts & 0xEFFFFFFF}" f"{acc.acc_l_finalsts & 0xEFFFFFFF}"
) )
pgm.set_terminated(acc.acc_l_finalsts, acc.acc_q_termtime) pgm.set_terminated(acc.acc_l_finalsts, acc.acc_q_termtime)
...@@ -873,7 +873,7 @@ ...@@ -873,7 +873,7 @@
) )
lib.set_logical( lib.set_logical(
b"SUPERVISORD" + b"_PID", b"SUPERVISORD" + b"_PID",
hex(pid)[2:].upper(), f"{pid:08X}",
supervisord_table_name, supervisord_table_name,
) )
starlet.wake(pid) starlet.wake(pid)
...@@ -941,7 +941,7 @@ ...@@ -941,7 +941,7 @@
if pid is None: if pid is None:
print("Unable to start supervisord daemon") print("Unable to start supervisord daemon")
else: else:
print(f"Daemon started {hex(pid)[2:].upper()}") print(f"Daemon started {pid:08X}")
exit(0) exit(0)
logfile = config["supervisord"].get("logfile", "supervisord.log") logfile = config["supervisord"].get("logfile", "supervisord.log")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment