[or-cvs] r20351: {torflow} Fix a couple log messages and modify the cron script. (torflow/trunk/NetworkScanners/ExitAuthority)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-08-21 13:34:15 -0400 (Fri, 21 Aug 2009)
New Revision: 20351

Modified:
   torflow/trunk/NetworkScanners/ExitAuthority/cron.sh
   torflow/trunk/NetworkScanners/ExitAuthority/snakeinspector.py
   torflow/trunk/NetworkScanners/ExitAuthority/soat.py
Log:

Fix a couple log messages and modify the cron script.



Modified: torflow/trunk/NetworkScanners/ExitAuthority/cron.sh
===================================================================
--- torflow/trunk/NetworkScanners/ExitAuthority/cron.sh	2009-08-21 16:56:44 UTC (rev 20350)
+++ torflow/trunk/NetworkScanners/ExitAuthority/cron.sh	2009-08-21 17:34:15 UTC (rev 20351)
@@ -1 +1,2 @@
-./snakeinspector --confirmed --email --noreason FailureTimeout
+
+~/code/torflow-soat/NetworkScanners/ExitAuthority/snakeinspector.py --confirmed --email --noreason FailureTimeout

Modified: torflow/trunk/NetworkScanners/ExitAuthority/snakeinspector.py
===================================================================
--- torflow/trunk/NetworkScanners/ExitAuthority/snakeinspector.py	2009-08-21 16:56:44 UTC (rev 20350)
+++ torflow/trunk/NetworkScanners/ExitAuthority/snakeinspector.py	2009-08-21 17:34:15 UTC (rev 20351)
@@ -196,7 +196,7 @@
           text += traceback.format_exc()
       # TODO: Attach files? Or is that too much.. Maybe serve
       # them via http and include links?
-      send_mail(from_email, [to_email], subject, text, mail_server)
+      send_mail(from_email, to_email, subject, text, mail_server)
 
 if __name__ == "__main__":
   main(sys.argv)

Modified: torflow/trunk/NetworkScanners/ExitAuthority/soat.py
===================================================================
--- torflow/trunk/NetworkScanners/ExitAuthority/soat.py	2009-08-21 16:56:44 UTC (rev 20350)
+++ torflow/trunk/NetworkScanners/ExitAuthority/soat.py	2009-08-21 17:34:15 UTC (rev 20351)
@@ -2604,7 +2604,7 @@
     print ''
     return
 
-  opts = ['ssl','rescan', 'pernode=', 'resume', 'html','http','ssh','smtp','pop','imap','dns','dnsrebind','policies','exit=']
+  opts = ['ssl','rescan', 'pernode=', 'resume=', 'html','http','ssh','smtp','pop','imap','dns','dnsrebind','policies','exit=']
   flags, trailer = getopt.getopt(argv[1:], [], opts)
   
   # get specific test types
@@ -2679,7 +2679,7 @@
   tests = {}
 
   if do_resume:
-    plog("NOTICE", "Resuming previous SoaT run")
+    plog("NOTICE", "Resuming previous SoaT run #"+str(resume_run))
     if do_ssl:
       tests["SSL"] = datahandler.loadTest("SSLTest", resume_run)