[or-cvs] r18084: {torflow} Print stacktrace for KeyboardInterrupt for when we mysteriou (torflow/trunk/NetworkScanners)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2009-01-11 23:48:16 -0500 (Sun, 11 Jan 2009)
New Revision: 18084

Modified:
   torflow/trunk/NetworkScanners/soat.py
   torflow/trunk/NetworkScanners/speedracer.py
Log:

Print stacktrace for KeyboardInterrupt for when we 
mysteriously hang...



Modified: torflow/trunk/NetworkScanners/soat.py
===================================================================
--- torflow/trunk/NetworkScanners/soat.py	2009-01-11 23:13:38 UTC (rev 18083)
+++ torflow/trunk/NetworkScanners/soat.py	2009-01-12 04:48:16 UTC (rev 18084)
@@ -1179,7 +1179,7 @@
         print '--dnsrebind (works with the ssl test)'
         print '--policies (~works)'
         print ''
-        sys.exit(0)
+        return
 
     opts = ['ssl','http','ssh','smtp','pop','imap','dns','dnsrebind','policies']
     flags, trailer = getopt.getopt(argv[1:], [], opts)
@@ -1212,7 +1212,7 @@
     # maybe only the consistency test was required
     if not (do_ssl or do_http or do_ssh or do_smtp or do_pop or do_imap or do_dns_basic):
         plog('INFO', 'Done.')
-        sys.exit(0)
+        return
 
     # declare some variables and assign values if neccessary
     ssl_nodes = http_nodes = ssh_nodes = smtp_nodes = pop_nodes = imap_nodes = dns_nodes = []
@@ -1370,6 +1370,7 @@
         main(sys.argv)
     except KeyboardInterrupt:
         plog('INFO', "Ctrl + C was pressed. Exiting ... ")
+        traceback.print_exc()
     except Exception, e:
         plog('ERROR', "An unexpected error occured.")
         traceback.print_exc()

Modified: torflow/trunk/NetworkScanners/speedracer.py
===================================================================
--- torflow/trunk/NetworkScanners/speedracer.py	2009-01-11 23:13:38 UTC (rev 18083)
+++ torflow/trunk/NetworkScanners/speedracer.py	2009-01-12 04:48:16 UTC (rev 18084)
@@ -180,6 +180,7 @@
         main(sys.argv)
     except KeyboardInterrupt:
         plog('INFO', "Ctrl + C was pressed. Exiting ... ")
+        traceback.print_exc()
     except Exception, e:
         plog('ERROR', "An unexpected error occured.")
         traceback.print_exc()