Merge pull request #77 from juga0/feature/tordir

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
@@ -160,8 +160,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

@@ -21,6 +21,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,7 +59,8 @@ 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)