[tor-commits] [ooni-probe/develop] Set the default collector via the command line option

[isis at torproject.org]

commit b5c99e327a9c2ef1a2f2b9aa8d41d82a4dcc63d1
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Feb 28 20:47:05 2013 +0100

    Set the default collector via the command line option
---
 collector       |    1 -
 ooni/oonicli.py |   11 +----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/collector b/collector
deleted file mode 100644
index 0b260a1..0000000
--- a/collector
+++ /dev/null
@@ -1 +0,0 @@
-httpo://nkvphnp3p6agi5qq.onion
diff --git a/ooni/oonicli.py b/ooni/oonicli.py
index 93bf8bf..af06ad2 100644
--- a/ooni/oonicli.py
+++ b/ooni/oonicli.py
@@ -29,8 +29,7 @@ class Options(usage.Options):
                 " files listed on the command line")
 
     optFlags = [["help", "h"],
-                ["resume", "r"],
-                ["no-default-reporter", "n"]]
+                ["resume", "r"]]
 
     optParameters = [["reportfile", "o", None, "report file name"],
                      ["testdeck", "i", None,
@@ -154,14 +153,6 @@ def runWithDirector():
                     log.msg("for example: ooniprobe -c httpo://nkvphnp3p6agi5qq.onion")
                     sys.exit(1)
 
-            # Select one of the baked-in reporters unless the user has requested otherwise
-            if not global_options['no-default-reporter']:
-                with open('collector') as f:
-                    reporter_url = random.choice(f.readlines())
-                    reporter_url = reporter_url.split('#')[0].strip()
-                    oonib_reporter = OONIBReporter(test_details, reporter_url)
-                    reporters.append(oonib_reporter)
-
             log.debug("adding callback for startNetTest")
             d.addCallback(director.startNetTest, net_test_loader, reporters)
         d.addCallback(shutdown)