[or-cvs] r18510: {torflow} On second thought, --restart should really be called --resum (torflow/trunk/NetworkScanners)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2009-02-12 12:16:16 -0500 (Thu, 12 Feb 2009)
New Revision: 18510

Modified:
   torflow/trunk/NetworkScanners/README.ExitScanning
   torflow/trunk/NetworkScanners/soat.py
Log:

On second thought, --restart should really be called --resume.



Modified: torflow/trunk/NetworkScanners/README.ExitScanning
===================================================================
--- torflow/trunk/NetworkScanners/README.ExitScanning	2009-02-12 17:12:10 UTC (rev 18509)
+++ torflow/trunk/NetworkScanners/README.ExitScanning	2009-02-12 17:16:16 UTC (rev 18510)
@@ -154,19 +154,19 @@
 and is continuing to run. If there are any issues, please mail me your
 soat.log.
 
-If/When SoaT crashes, you should be able to restart it exactly where it
+If/When SoaT crashes, you should be able to resume it exactly where it
 left off with:
 
-# ./soat.py --restart --ssl --html --http --dnsrebind >& soat.log &
+# ./soat.py --resume --ssl --html --http --dnsrebind >& soat.log &
 
-Keeping the same options during a --restart is a Really Good Idea.
+Keeping the same options during a --resume is a Really Good Idea.
 
 Soat actually saves a snapshot to a unique name each time you run it, so
-you can go back in time and restart arbitrary runs by specifying their
+you can go back in time and resume arbitrary runs by specifying their
 number:
 
 # ls ./data/soat/
-# ./soat.py --restart 2 --ssl --html --http --dnsrebind >& soat.log &
+# ./soat.py --resume 2 --ssl --html --http --dnsrebind >& soat.log &
 
 
 C. Handling Results
@@ -208,7 +208,7 @@
 
 # ./soat.py --rescan --ssl --html --http --dnsrebind >& soat.log &
 
-Rescans can also be restarted with --restart should they fail.
+Rescans can also be resumed with --resume should they fail.
 
 By default, soat also does a rescan at the end of every loop through the
 node list, though this may change, because we can't apply the network-wide

Modified: torflow/trunk/NetworkScanners/soat.py
===================================================================
--- torflow/trunk/NetworkScanners/soat.py	2009-02-12 17:12:10 UTC (rev 18509)
+++ torflow/trunk/NetworkScanners/soat.py	2009-02-12 17:16:16 UTC (rev 18510)
@@ -2234,7 +2234,7 @@
     print ''
     print 'Please provide at least one test option:'
     print '--pernode <n>'
-    print '--restart [<n>]'
+    print '--resume [<n>]'
     print '--rescan [<n>]'
     print '--ssl'
     print '--http'
@@ -2249,11 +2249,11 @@
     print ''
     return
 
-  opts = ['ssl','rescan', 'pernode=', 'restart', '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
-  do_restart = False
+  do_resume = False
   do_rescan = ('--rescan','') in flags
   do_ssl = ('--ssl','') in flags
   do_http = ('--http','') in flags
@@ -2275,14 +2275,14 @@
     if flag[0] == "--rescan" and flag[1]:
       global num_rescan_tests_per_node
       num_rescan_tests_per_node = int(flag[1])
-    if flag[0] == "--restart":
-      do_restart = True
+    if flag[0] == "--resume":
+      do_resume = True
       if flag[1]:
-        restart_run=int(flag[1])
+        resume_run=int(flag[1])
       else:
-        restart_run=-1
+        resume_run=-1
 
-  # Make logs go to disk so restarts are less painful
+  # Make logs go to disk so resumes are less painful
   #TorUtil.logfile = open(log_file_name, "a")
 
   # initiate the connection to the metatroller
@@ -2313,15 +2313,15 @@
 
   tests = {}
 
-  if do_restart:
+  if do_resume:
     if do_ssl:
-      tests["SSL"] = datahandler.loadTest("SSLTest", restart_run)
+      tests["SSL"] = datahandler.loadTest("SSLTest", resume_run)
 
     if do_http:
-      tests["HTTP"] = datahandler.loadTest("HTTPTest", restart_run)
+      tests["HTTP"] = datahandler.loadTest("HTTPTest", resume_run)
 
     if do_html:
-      tests["HTML"] = datahandler.loadTest("HTMLTest", restart_run)
+      tests["HTML"] = datahandler.loadTest("HTMLTest", resume_run)
   else:
     if do_ssl:
       tests["SSL"] = SSLTest(ssl_wordlist_file)
@@ -2342,7 +2342,7 @@
     for test in tests.itervalues():
       test.load_rescan(TEST_FAILURE)
 
-  if not do_restart:
+  if not do_resume:
     for test in tests.itervalues():
       test.rewind()