From 72b55b5aadad20eba742b15a235a60fea2f21689 Mon Sep 17 00:00:00 2001 From: Clark Williams Date: Mon, 2 Apr 2012 16:21:05 -0500 Subject: reenabled SIGINT and SIGTERM handlers Accidentally left SIGINT and SIGTERM signal handlers commented out when committing. Undo this thinko... Signed-off-by: Clark Williams --- rteval/rteval.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rteval/rteval.py b/rteval/rteval.py index 8fc9973..d33215a 100644 --- a/rteval/rteval.py +++ b/rteval/rteval.py @@ -8,8 +8,8 @@ # latency while the loads are running. A report is generated # to show the latencies encountered during the run. # -# Copyright 2009,2010,2011 Clark Williams -# Copyright 2009,2010,2011 David Sommerseth +# Copyright 2009,2010,2011,2012 Clark Williams +# Copyright 2009,2010,2011,2012 David Sommerseth # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -716,8 +716,8 @@ class RtEval(object): report_interval = int(self.config.GetSection('rteval').report_interval) # wait for time to expire or thread to die -# signal.signal(signal.SIGINT, sigint_handler) -# signal.signal(signal.SIGTERM, sigterm_handler) + signal.signal(signal.SIGINT, sigint_handler) + signal.signal(signal.SIGTERM, sigterm_handler) self.info("waiting for duration (%f)" % self.config.duration) stoptime = (time.time() + self.config.duration) currtime = time.time() @@ -748,8 +748,8 @@ class RtEval(object): print "load average: %.2f" % (accum / samples) currtime = time.time() self.debug("out of measurement loop") -# signal.signal(signal.SIGINT, signal.SIG_DFL) -# signal.signal(signal.SIGTERM, signal.SIG_DFL) + signal.signal(signal.SIGINT, signal.SIG_DFL) + signal.signal(signal.SIGTERM, signal.SIG_DFL) except RuntimeError, e: print "Runtime error during measurement: %s", e -- cgit