From 18fd3f8d27f0b3ff62d1758ac105efadfbab0919 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Sat, 2 Mar 2013 08:01:31 -0500 Subject: [PATCH] add non-daemon mode for development I found in trying to add features, I really needed a non daemon mode to do this efficiently. It shouldn't hurt to have it in the main program. Change-Id: Ie8c02a7b6f834436aa5749097e3d9f6dbb33107b Reviewed-on: https://review.openstack.org/23340 Reviewed-by: James E. Blair Reviewed-by: Monty Taylor Reviewed-by: Clark Boylan Approved: Clark Boylan Tested-by: Jenkins --- modules/recheckwatch/files/recheckwatch | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/recheckwatch/files/recheckwatch b/modules/recheckwatch/files/recheckwatch index 0b8f3c9204..3092077604 100755 --- a/modules/recheckwatch/files/recheckwatch +++ b/modules/recheckwatch/files/recheckwatch @@ -149,25 +149,28 @@ class Scoreboard(threading.Thread): except: traceback.print_exc() -def _main(): +def _main(daemonize=True): config = ConfigParser.ConfigParser() config.read(sys.argv[1]) s = Scoreboard(config) - s.start() + if daemonize: + s.start() def main(): if len(sys.argv) < 2: print "Usage: %s CONFIGFILE" % sys.argv[0] sys.exit(1) - if '-d' not in sys.argv: + if '-n' in sys.argv: + _main(daemonize=False) + elif '-d' in sys.argv: + _main() + else: pid = pid_file_module.TimeoutPIDLockFile( "/var/run/recheckwatch/recheckwatch.pid", 10) with daemon.DaemonContext(pidfile=pid): _main() - else: - _main() if __name__ == "__main__": main()