mirror of
/repos/baseimage-docker.git
synced 2025-12-30 08:01:31 +01:00
Merge pull request #20 from thomasleveil/fix/failed-shutdown-msg
Fix failed shutdown message not displaying process name and PID
This commit is contained in:
commit
3d5a46482f
@ -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:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user