GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 3cbba222 authored by Georg Koppen's avatar Georg Koppen Committed by juga

Bug 33600: `max_pending_results` is not directly used in `main_loop`

parent e361caf8
...@@ -460,7 +460,7 @@ def result_putter_error(target): ...@@ -460,7 +460,7 @@ def result_putter_error(target):
def main_loop(args, conf, controller, relay_list, circuit_builder, result_dump, 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. """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 It starts a loop that will be run while there is not and event signaling
...@@ -701,8 +701,7 @@ def run_speedtest(args, conf): ...@@ -701,8 +701,7 @@ def run_speedtest(args, conf):
max_pending_results = conf.getint('scanner', 'measurement_threads') max_pending_results = conf.getint('scanner', 'measurement_threads')
pool = Pool(max_pending_results) pool = Pool(max_pending_results)
try: try:
main_loop(args, conf, controller, rl, cb, rd, rp, destinations, main_loop(args, conf, controller, rl, cb, rd, rp, destinations, pool)
max_pending_results, pool)
except KeyboardInterrupt: except KeyboardInterrupt:
log.info("Interrupted by the user.") log.info("Interrupted by the user.")
stop_threads(signal.SIGINT, None) stop_threads(signal.SIGINT, None)
......
Markdown is supported
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