Iwan/baseimage-docker_fr
1
0
Fork 0
forked from Docker/baseimage-docker
Code Issues Pull Requests Releases Wiki Activity

cleaning up getter/setter for KILL_PROCESS_TIMEOUT/KILL_ALL_PROCESSES_TIMEOUT

Browse Source
This commit is contained in:
Travis Rowland
2017-03-19 16:17:52 -07:00
parent 7ec5a0a65f
commit d9e762730a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
image/bin/my_init
View File

@@ -1,8 +1,8 @@
#!/usr/bin/python3 -u #!/usr/bin/python3 -u
import os, os.path, sys, stat, signal, errno, argparse, time, json, re import os, os.path, sys, stat, signal, errno, argparse, time, json, re
KILL_PROCESS_TIMEOUT = 5 if not os.environ.get('KILL_PROCESS_TIMEOUT') else os.environ.get('KILL_PROCESS_TIMEOUT') KILL_PROCESS_TIMEOUT = os.environ.get('KILL_PROCESS_TIMEOUT', 5)
KILL_ALL_PROCESSES_TIMEOUT = 5 if not os.environ.get('KILL_ALL_PROCESSES_TIMEOUT') else os.environ.get('KILL_ALL_PROCESSES_TIMEOUT') KILL_ALL_PROCESSES_TIMEOUT = os.environ.get('KILL_ALL_PROCESSES_TIMEOUT', 5)
LOG_LEVEL_ERROR = 1 LOG_LEVEL_ERROR = 1
LOG_LEVEL_WARN = 1 LOG_LEVEL_WARN = 1
@@ -276,7 +276,7 @@ def main(args):
if not args.skip_startup_files: if not args.skip_startup_files:
run_startup_files() run_startup_files()
runit_exited = False runit_exited = False
exit_code = None exit_code = None