1
0
mirror of /repos/baseimage-docker.git synced 2025-12-31 08:11:29 +01:00

fix failed shutdown message not displaying process name and PID

This commit is contained in:
Thomas LÉVEIL 2014-02-22 16:36:41 +01:00
parent 3eec5201da
commit 1443856c34

View File

@ -75,7 +75,7 @@ def stop_child_process(name, pid, signo = signal.SIGTERM, time_limit = KILL_PROC
except OSError: except OSError:
pass pass
except AlarmException: except AlarmException:
warn("%s (PID %d) did not shut down in time. Forcing it to exit.") warn("%s (PID %d) did not shut down in time. Forcing it to exit." % (name, pid))
try: try:
os.kill(pid, signal.SIGKILL) os.kill(pid, signal.SIGKILL)
except OSError: except OSError: