Commit c040a276 authored by Matt Traudt's avatar Matt Traudt
Browse files

Remove 2 unused options 

GH: closes #149
parent 873392dd

sbws/config.default.ini

+0 −3
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ data_period = 5 
[scanner]

# A human-readable string with chars in a-zA-Z0-9 to identify your scanner

nickname = IDidntEditTheSBWSConfig

# Maximum number of bytes to read for each sock.recv() call

max_recv_per_read = 1048576

# Limits on what download times are too fast/slow/etc.

download_toofast = 1

download_min = 5
@@ -45,7 +43,6 @@ max_download_size = 1073741824 
[tor]

datadir = ${paths:sbws_home}/tor

control_socket = ${tor:datadir}/control_socket

control_cookie = ${tor:datadir}/control_cookie

log = ${tor:datadir}/log.txt

extra_lines =

sbws/util/config.py

+1 −3
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ def _validate_scanner(conf): 
    sec = 'scanner'

    err_tmpl = Template('$sec/$key ($val): $e')

    ints = {

        'max_recv_per_read': {'minimum': 1, 'maximum': None},

        'num_rtts': {'minimum': 1, 'maximum': 100},

        'num_downloads': {'minimum': 1, 'maximum': 100},

        'initial_read_request': {'minimum': 1, 'maximum': None},
@@ -179,8 +178,7 @@ def _validate_tor(conf): 
    sec = 'tor'

    err_tmpl = Template('$sec/$key ($val): $e')

    unvalidated_keys = [

        'datadir', 'control_socket', 'control_cookie', 'log',

        'extra_lines']

        'datadir', 'control_socket', 'log', 'extra_lines']

    all_valid_keys = unvalidated_keys

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

    return errors