From d9e762730a1c065cf3eac10d3435664edff44b61 Mon Sep 17 00:00:00 2001 From: Travis Rowland Date: Sun, 19 Mar 2017 16:17:52 -0700 Subject: [PATCH] cleaning up getter/setter for KILL_PROCESS_TIMEOUT/KILL_ALL_PROCESSES_TIMEOUT --- image/bin/my_init | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/image/bin/my_init b/image/bin/my_init index 54cf26a..354b362 100755 --- a/image/bin/my_init +++ b/image/bin/my_init @@ -1,8 +1,8 @@ #!/usr/bin/python3 -u 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_ALL_PROCESSES_TIMEOUT = 5 if not os.environ.get('KILL_ALL_PROCESSES_TIMEOUT') else os.environ.get('KILL_ALL_PROCESSES_TIMEOUT') +KILL_PROCESS_TIMEOUT = os.environ.get('KILL_PROCESS_TIMEOUT', 5) +KILL_ALL_PROCESSES_TIMEOUT = os.environ.get('KILL_ALL_PROCESSES_TIMEOUT', 5) LOG_LEVEL_ERROR = 1 LOG_LEVEL_WARN = 1 @@ -276,7 +276,7 @@ def main(args): if not args.skip_startup_files: run_startup_files() - + runit_exited = False exit_code = None