Add tor directory parameter to launch_tor

bwscanner/attacher.py

@@ -135,7 +135,7 @@ def got_newconsensus(event):
 
 
 @defer.inlineCallbacks
-def connect_to_tor(launch_tor, circuit_build_timeout, control_port=None,
+def connect_to_tor(launch_tor, circuit_build_timeout, tor_dir=None, control_port=None,
                    tor_overrides=None):
     """
     Launch or connect to a Tor instance
@@ -158,8 +158,7 @@ def connect_to_tor(launch_tor, circuit_build_timeout, control_port=None,
 
     if launch_tor:
         log.info("Spawning a new Tor instance.")
-        # TODO: Pass in data_dir directory so consensus can be cached
-        tor = yield txtorcon.launch(reactor)
+        tor = yield txtorcon.launch(reactor, data_directory=tor_dir)
     else:
         log.info("Trying to connect to a running Tor instance.")
         if control_port:

bwscanner/scanner.py

@@ -1,5 +1,6 @@
 import os
 import sys
+import signal
 import time
 
 import click
@@ -12,6 +13,7 @@
 
 
 BWSCAN_VERSION = '0.0.1'
+BASEURL = 'https://siv.sunet.se/bwauth/'
 
 
 class ScanInstance(object):
@@ -21,6 +23,7 @@ class ScanInstance(object):
     def __init__(self, data_dir):
         self.data_dir = data_dir
         self.measurement_dir = os.path.join(data_dir, 'measurements')
+        self.tor_dir = os.path.join(data_dir, 'tor_data')
 
     def __repr__(self):
         return '<BWScan %r>' % self.data_dir
@@ -58,13 +61,18 @@ def cli(ctx, data_dir, loglevel, logfile, launch_tor, circuit_build_timeout):
         os.makedirs(ctx.obj.measurement_dir)
 
     # Create a connection to a Tor instance
-    ctx.obj.tor_state = connect_to_tor(launch_tor, circuit_build_timeout)
+    ctx.obj.tor_state = connect_to_tor(launch_tor, circuit_build_timeout,
+                                       ctx.obj.tor_dir)
 
     # Set up the logger to only output log lines of level `loglevel` and above.
     setup_logging(log_level=loglevel, log_name=logfile)
 
 
 @cli.command(short_help="Measure the Tor relays.")
+# FIXME: when having a configuration file the default will be given by it.
+@click.option('--baseurl',
+              help='URL that provides the files to perform the measurements with',
+              default=BASEURL)
 @click.option('--partitions', '-p', default=1,
               help='Divide the set of relays into subsets. 1 by default.')
 @click.option('--current-partition', '-c', default=1,
@@ -75,7 +83,7 @@ def cli(ctx, data_dir, loglevel, logfile, launch_tor, circuit_build_timeout):
               help='Limit the number of simultaneous bandwidth measurements '
               '(default: %d).' % 10)
 @pass_scan
-def scan(scan, partitions, current_partition, timeout, request_limit):
+def scan(scan, baseurl, partitions, current_partition, timeout, request_limit):
     """
     Start a scan through each Tor relay to measure it's bandwidth.
     """
@@ -88,18 +96,31 @@ def scan(scan, partitions, current_partition, timeout, request_limit):
         os.makedirs(scan_data_dir)
 
     def rename_finished_scan(deferred):
+        log.debug('renaming finished scan with deferred')
         click.echo(deferred)
         os.rename(scan_data_dir, os.path.join(scan.measurement_dir, scan_time))
 
-    scan.tor_state.addCallback(BwScan, reactor, scan_data_dir,
+    log.debug('adding callback to tor_state')
+    scan.tor_state.addCallback(BwScan, reactor, scan_data_dir, baseurl,
                                request_timeout=timeout,
                                request_limit=request_limit,
                                partitions=partitions,
                                this_partition=current_partition)
+    # NOTE: in measurements?
+    log.debug('adding callback to tor_state')
     scan.tor_state.addCallback(lambda scanner: scanner.run_scan())
+    # NOTE: why lambda here?
+    log.debug('adding callback to tor_state')
     scan.tor_state.addCallback(lambda _: reactor.stop())
+    log.debug('adding callback to tor_state')
     scan.tor_state.addCallback(rename_finished_scan)
+    def signal_handler(signal, frame):
+        print "signal caught, stopping probe"
+        reactor.stop()
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGTERM, signal_handler)
 
+    log.debug('reactor run')
     reactor.run()