diff options
author | teor <teor2345@gmail.com> | 2017-03-04 22:46:19 +1100 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-03-14 11:54:08 -0400 |
commit | c34411d9cb1c264ad5ccc149ea07f1fdc826010a (patch) | |
tree | f3bd48455c13e26cbf894a7d85d90074511e7277 /src | |
parent | c99d0e742adbe878d8126a49573e83462a61742e (diff) | |
download | tor-c34411d9cb1c264ad5ccc149ea07f1fdc826010a.tar.gz tor-c34411d9cb1c264ad5ccc149ea07f1fdc826010a.zip |
Log info about intro point limits when they are reached and reset
Depends on 21594, part of 21622.
Diffstat (limited to 'src')
-rw-r--r-- | src/or/rendservice.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 2b7c6bfb69..82e31377cf 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -4136,8 +4136,12 @@ rend_consider_services_intro_points(void) /* This retry period is important here so we don't stress circuit * creation. */ + if (now > service->intro_period_started + INTRO_CIRC_RETRY_PERIOD) { - /* One period has elapsed; we can try building circuits again. */ + /* One period has elapsed: + * - if we stopped, we can try building circuits again, + * - if we haven't, we reset the circuit creation counts. */ + rend_log_intro_limit(service, LOG_INFO); service->intro_period_started = now; service->n_intro_circuits_launched = 0; } else if (service->n_intro_circuits_launched >= @@ -4145,6 +4149,7 @@ rend_consider_services_intro_points(void) service->n_intro_points_wanted)) { /* We have failed too many times in this period; wait for the next * one before we try to initiate any more connections. */ + rend_log_intro_limit(service, LOG_WARN); continue; } |