Commit 873392dd authored by Matt Traudt's avatar Matt Traudt
Browse files

Move option for not measuring authorities

parent d6d5d475

sbws/config.default.ini

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ num_downloads = 5 
initial_read_request = 16384

# How many measurements to make in parallel

measurement_threads = 3

# Whether or not to measure authorities

measure_authorities = off

# Minimum number of bytes we should ever try to download in a measurement

min_download_size = 1

# Maximum number of bytes we should ever try to download in a measurement
@@ -58,6 +56,8 @@ stale_days = 10 
rotten_days = 90



[relayprioritizer]

# Whether or not to measure authorities

measure_authorities = off

# The target fraction of best priority relays we would like to return.

# 0.05 is 5%. In a 7000 relay network, 5% is 350 relays.

#

sbws/lib/relayprioritizer.py

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class RelayPrioritizer: 
        self.relay_list = relay_list

        self.result_dump = result_dump

        self.measure_authorities = conf.getboolean(

            'scanner', 'measure_authorities')

            'relayprioritizer', 'measure_authorities')

        self.min_to_return = conf.getint('relayprioritizer', 'min_relays')

        self.fraction_to_return = conf.getfloat(

            'relayprioritizer', 'fraction_relays')

sbws/util/config.py

+7 −8
Original line number Diff line number Diff line
@@ -163,16 +163,10 @@ def _validate_scanner(conf): 
        'download_target': {'minimum': 0.001, 'maximum': None},

        'download_max': {'minimum': 0.001, 'maximum': None},

    }

    bools = {

        'measure_authorities': {},

    }

    all_valid_keys = list(ints.keys()) + list(floats.keys()) + \

        list(bools.keys()) + ['nickname']

    all_valid_keys = list(ints.keys()) + list(floats.keys()) + ['nickname']

    errors.extend(_validate_section_keys(conf, sec, all_valid_keys, err_tmpl))

    errors.extend(_validate_section_ints(conf, sec, ints, err_tmpl))

    errors.extend(_validate_section_floats(conf, sec, floats, err_tmpl))

    # XXX: validate hosts func doesn't do anything currently

    errors.extend(_validate_section_bools(conf, sec, bools, err_tmpl))

    valid, error_msg = _validate_nickname(conf[sec], 'nickname')

    if not valid:

        errors.append(err_tmpl.substitute(
@@ -202,10 +196,15 @@ def _validate_relayprioritizer(conf): 
    floats = {

        'fraction_relays': {'minimum': 0.0, 'maximum': 1.0},

    }

    all_valid_keys = list(ints.keys()) + list(floats.keys())

    bools = {

        'measure_authorities': {},

    }

    all_valid_keys = list(ints.keys()) + list(floats.keys()) +\

        list(bools.keys())

    errors.extend(_validate_section_keys(conf, sec, all_valid_keys, err_tmpl))

    errors.extend(_validate_section_ints(conf, sec, ints, err_tmpl))

    errors.extend(_validate_section_floats(conf, sec, floats, err_tmpl))

    errors.extend(_validate_section_bools(conf, sec, bools, err_tmpl))

    return errors