Commit c780edf2 authored by Matt Traudt's avatar Matt Traudt Committed by Matt Traudt
Browse files

Essentially revert giving HelperRelayList the stream builder lock

parent b70cbe3a
......@@ -280,7 +280,7 @@ def run_speedtest(args, conf):
rd = ResultDump(args, conf, end_event)
rp = RelayPrioritizer(args, conf, rl, rd)
helpers, error_msg = HelperRelayList.from_config(
args, conf, stream_building_lock, controller=controller)
args, conf, controller=controller)
if not helpers:
max_pending_results = conf.getint('scanner', 'measurement_threads')
......@@ -30,8 +30,7 @@ class HelperRelay:
class HelperRelayList:
def __init__(self, args, conf, helpers, stream_building_lock,
def __init__(self, args, conf, helpers, controller=None):
if controller is None:
c, error_msg = stem_utils.init_controller_with_config(conf)
assert c, error_msg
......@@ -43,7 +42,7 @@ class HelperRelayList:
self.helpers = helpers
def from_config(args, conf, stream_building_lock, controller=None):
def from_config(args, conf, controller=None):
''' Returns a new HelperRelayList and an empty string if everything
goes okay loading HelperRelays from the given config file. Otherwise,
returns None and an error string '''
......@@ -58,9 +57,7 @@ class HelperRelayList:
assert helper_sec in conf # validate_config should require this
log.debug('Loading info for helper %s', key)
return HelperRelayList(
args, conf, helpers, stream_building_lock,
controller=controller), ''
return HelperRelayList(args, conf, helpers, controller=controller), ''
def next(self, blacklist=[]):
''' Returns the next helper in the list that should be used. Do not
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment