commit 3cbba2228eba41f17369d15ee1f2d1918a0420ae Author: Georg Koppen <gk@torproject.org> Date: Wed Mar 11 11:03:23 2020 +0000 Bug 33600: `max_pending_results` is not directly used in `main_loop` --- sbws/core/scanner.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 3178594..60c8ca4 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -460,7 +460,7 @@ def result_putter_error(target): def main_loop(args, conf, controller, relay_list, circuit_builder, result_dump, - relay_prioritizer, destinations, max_pending_results, pool): + relay_prioritizer, destinations, pool): """Starts and reuse the threads that measure the relays forever. It starts a loop that will be run while there is not and event signaling @@ -701,8 +701,7 @@ def run_speedtest(args, conf): max_pending_results = conf.getint('scanner', 'measurement_threads') pool = Pool(max_pending_results) try: - main_loop(args, conf, controller, rl, cb, rd, rp, destinations, - max_pending_results, pool) + main_loop(args, conf, controller, rl, cb, rd, rp, destinations, pool) except KeyboardInterrupt: log.info("Interrupted by the user.") stop_threads(signal.SIGINT, None)