From 9309fc6b483ef69dc775085263653f3fda3f1b65 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Thu, 12 Mar 2009 18:51:04 +0000 Subject: [PATCH] add exception for KeyboardInterrupt to allow for manual stop without generating exception emails. --- monitor/scanapi.py | 2 +- pcucontrol/util/command.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/monitor/scanapi.py b/monitor/scanapi.py index 8097bac..e1a09e8 100644 --- a/monitor/scanapi.py +++ b/monitor/scanapi.py @@ -208,7 +208,7 @@ class ScanNodeInternal(ScanInterface): echo ' "princeton_comon_running":"'`ls -d /proc/virtual/$ID`'",' echo ' "princeton_comon_procs":"'`vps ax | grep $ID | grep -v grep | wc -l`'",' echo "}" - EOF """) +EOF """) values['ssh_error'] = errval if len(oval) > 0: diff --git a/pcucontrol/util/command.py b/pcucontrol/util/command.py index e5663c3..899d667 100644 --- a/pcucontrol/util/command.py +++ b/pcucontrol/util/command.py @@ -73,6 +73,9 @@ class CMD: except ExceptionReadTimeout: print traceback.print_exc() return ("", "RunningScriptTimeout") + except KeyboardInterrupt: + print "Interrupted, exiting..." + sys.exit(1) except Exception, err: from monitor.common import email_exception email_exception() -- 2.43.0