diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-24 09:30:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-24 09:30:30 -0400 |
| commit | 8ff2a8c0e2e5bc19de23adf131d726287319a276 (patch) | |
| tree | adf51cdbd1a4fbb6883c2c26baea5c8d5c49ce7c /src/or | |
| parent | 7bc636fdc937c5cd050cb243e5bebb8a52c1c144 (diff) | |
| parent | 74f7657e5637ce1fb6a6b059a41b6573587db057 (diff) | |
| download | tor-8ff2a8c0e2e5bc19de23adf131d726287319a276.tar.gz tor-8ff2a8c0e2e5bc19de23adf131d726287319a276.zip | |
Merge remote-tracking branch 'dgoulet/bug22032_031_01'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/rendservice.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 3c4b6775c0..c19c85f6a3 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1054,20 +1054,13 @@ rend_log_intro_limit(const rend_service_t *service, int min_severity) } time_t intro_period_elapsed = time(NULL) - service->intro_period_started; tor_assert_nonfatal(intro_period_elapsed >= 0); - /* We delayed resuming circuits longer than expected */ - int exceeded_elapsed = (intro_period_elapsed > INTRO_CIRC_RETRY_PERIOD + - INTRO_CIRC_RETRY_PERIOD_SLOP); - if (exceeded_elapsed) { - severity = LOG_WARN; - } log_fn(severity, LD_REND, "Hidden service %s %s %d intro points in the last " - "%d seconds%s. Intro circuit launches are limited to %d per %d " + "%d seconds. Intro circuit launches are limited to %d per %d " "seconds.", service->service_id, exceeded_limit ? "exceeded launch limit with" : "launched", service->n_intro_circuits_launched, (int)intro_period_elapsed, - exceeded_elapsed ? " (delayed)" : "", rend_max_intro_circs_per_period(service->n_intro_points_wanted), INTRO_CIRC_RETRY_PERIOD); rend_service_dump_stats(severity); |