add exception for KeyboardInterrupt to allow for manual stop without

	generating exception emails.

diff --git a/monitor/scanapi.py b/monitor/scanapi.py
index 8097bac..e1a09e8 100644 (file)
--- 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 (file)
--- 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()