diff options
| author | teor <teor2345@gmail.com> | 2016-09-05 15:11:45 +1000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-13 10:13:56 -0400 |
| commit | c43211fd6cbb82a8016fcc0f81b309c6172e93d2 (patch) | |
| tree | e616dcea67525f7f727e2ef1cbed7833a4c58191 | |
| parent | 07d32d2e68daa6ef1ba03d8121998f619c409ff5 (diff) | |
| download | tor-c43211fd6cbb82a8016fcc0f81b309c6172e93d2.tar.gz tor-c43211fd6cbb82a8016fcc0f81b309c6172e93d2.zip | |
When LearnCircuitBuildTimeout is disabled by other options, be quieter
| -rw-r--r-- | src/or/config.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index f7f1f571ce..d56d9f6f9d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3465,8 +3465,18 @@ options_validate(or_options_t *old_options, or_options_t *options, RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT ); } else if (!options->LearnCircuitBuildTimeout && !options->CircuitBuildTimeout) { - log_notice(LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but didn't " - "a CircuitBuildTimeout. I'll pick a plausible default."); + int severity = LOG_NOTICE; + /* Be a little quieter if we've deliberately disabled + * LearnCircuitBuildTimeout. */ + if (options->OnionServiceSingleHopMode) { + severity = LOG_INFO; +#ifdef ENABLE_TOR2WEB_MODE + } else if (options->Tor2webMode) { + severity = LOG_INFO; +#endif + } + log_fn(severity, LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but " + "didn't a CircuitBuildTimeout. I'll pick a plausible default."); } if (options->PathBiasNoticeRate > 1.0) { |