40n8.me/baseimage-docker
1
0
Fork 0
mirror of /repos/baseimage-docker.git synced 2025-12-30 08:01:31 +01:00
Code Issues Releases Wiki Activity

Fix my_init not properly forcing Runit to shut down if Runit appears to refuse to respond to SIGTERM.

Browse Source
This commit is contained in:
Hongli Lai (Phusion) 2014-02-25 22:49:34 +01:00
parent 367cddb201
commit 1684aa1448
No known key found for this signature in database
GPG Key ID: 06A131094B6F4332
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -1,6 +1,7 @@
## 0.9.8
* Fixed a regression in `my_init` which causes it to delete environment variables passed from Docker.
* Fixed `my_init` not properly forcing Runit to shut down if Runit appears to refuse to respond to SIGTERM.
## 0.9.7 (release date: 2014-02-25)

24
image/my_init
View File

@ -94,6 +94,13 @@ def shquote(s):
def waitpid_reap_other_children(pid):
done = False
status = None
try:
this_pid, status = os.waitpid(pid, os.WNOHANG)
except OSError as e:
if e.errno == errno.ECHILD or e.errno == errno.ESRCH:
return None
else:
raise
while not done:
this_pid, status = os.waitpid(-1, 0)
done = this_pid == pid
@ -135,7 +142,10 @@ def run_command_killable(*argv):
stop_child_process(filename, pid)
raise
if status != 0:
error("%s failed with exit code %d\n" % (filename, status))
if status is None:
error("%s exited with unknown exit code\n" % filename)
else:
error("%s failed with exit code %d\n" % (filename, status))
sys.exit(1)
def run_command_killable_and_import_envvars(*argv):
@ -232,13 +242,21 @@ def main(args):
if len(args.main_command) == 0:
runit_exited, exit_code = wait_for_runit_or_interrupt(runit_pid)
if runit_exited:
info("Runit exited with code %d" % exit_code)
if exit_code is None:
info("Runit exited with unknown exit code")
exit_code = 1
else:
info("Runit exited with code %d" % exit_code)
else:
info("Running %s..." % " ".join(args.main_command))
pid = os.spawnvp(os.P_NOWAIT, args.main_command[0], args.main_command)
try:
exit_code = waitpid_reap_other_children(pid)
info("%s exited with exit code %d." % (args.main_command[0], exit_code))
if exit_code is None:
info("%s exited with unknown exit code." % args.main_command[0])
exit_code = 1
else:
info("%s exited with exit code %d." % (args.main_command[0], exit_code))
except KeyboardInterrupt:
stop_child_process(args.main_command[0], pid)
except BaseException as s: