[tor-commits] [tor/master] When LearnCircuitBuildTimeout is disabled by other options, be quieter

[nickm@xxxxxxxxxxxxxx]

commit c43211fd6cbb82a8016fcc0f81b309c6172e93d2
Author: teor <teor2345@xxxxxxxxx>
Date:   Mon Sep 5 15:11:45 2016 +1000

    When LearnCircuitBuildTimeout is disabled by other options, be quieter
---
 src/or/config.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index f7f1f57..d56d9f6 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) {



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits