40n8.me/baseimage-docker
1
0
Fork 0
mirror of /repos/baseimage-docker.git synced 2026-02-27 17:41:59 +01:00
Code Issues Releases Wiki Activity

Merge pull request #20 from thomasleveil/fix/failed-shutdown-msg

Browse Source 
Fix failed shutdown message not displaying process name and PID
This commit is contained in:
Hongli Lai
2014-02-24 13:23:04 +01:00
parent 6d1a12673b 1443856c34
commit 3d5a46482f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
image/my_init
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: