From 5835acc6f910e2bb1e3908802717eeff4122a9b8 Mon Sep 17 00:00:00 2001 From: Tom Lowenthal Date: Sat, 24 Sep 2011 15:34:32 -0700 Subject: [PATCH 1/4] Ticket #4063 - change circuit build timeout log entries from NOTICE to INFO --- src/or/circuitbuild.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index c6be46d858..888023d8f1 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1381,7 +1381,7 @@ circuit_build_times_set_timeout_worker(circuit_build_times_t *cbt) cbt->close_ms = MAX(cbt->close_ms, circuit_build_times_initial_timeout()); if (cbt->timeout_ms > max_time) { - log_notice(LD_CIRC, + log_info(LD_CIRC, "Circuit build timeout of %dms is beyond the maximum build " "time we have ever observed. Capping it to %dms.", (int)cbt->timeout_ms, max_time); @@ -1429,7 +1429,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt) timeout_rate = circuit_build_times_timeout_rate(cbt); if (prev_timeout > tor_lround(cbt->timeout_ms/1000)) { - log_notice(LD_CIRC, + log_info(LD_CIRC, "Based on %d circuit times, it looks like we don't need to " "wait so long for circuits to finish. We will now assume a " "circuit is too slow to use after waiting %ld seconds.", @@ -1440,7 +1440,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt) cbt->timeout_ms, cbt->close_ms, cbt->Xm, cbt->alpha, timeout_rate); } else if (prev_timeout < tor_lround(cbt->timeout_ms/1000)) { - log_notice(LD_CIRC, + log_info(LD_CIRC, "Based on %d circuit times, it looks like we need to wait " "longer for circuits to finish. We will now assume a " "circuit is too slow to use after waiting %ld seconds.", From ccceefe13674119768436bd1b9e3c4bf04ffc5ed Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sat, 24 Sep 2011 22:15:13 -0400 Subject: [PATCH 2/4] Add a changes file for Tom Lowenthal's patch for #4063 --- changes/ticket-4063 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changes/ticket-4063 diff --git a/changes/ticket-4063 b/changes/ticket-4063 new file mode 100644 index 0000000000..6a985b8c25 --- /dev/null +++ b/changes/ticket-4063 @@ -0,0 +1,6 @@ + o Minor bugfixes (usability): + - Downgrade log messages about circuit timeout calibration from + "notice" to "info": they don't require or suggest any human + intervention. Patch from Tom Lowenthal. Fixes bug 4063; + bugfix on 0.2.2.14-alpha. + From c42a1886cccbcd4f6e6e90526b5132d6a6cbb2a4 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sat, 24 Sep 2011 22:15:59 -0400 Subject: [PATCH 3/4] Trivial whitespace fixes --- src/or/connection_edge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 8609b023d5..0663787fba 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -842,8 +842,8 @@ addressmap_clear_excluded_trackexithosts(or_options_t *options) if (len < 6) continue; /* malformed. */ dot = target + len - 6; /* dot now points to just before .exit */ - while(dot > target && *dot != '.') - dot--; + while (dot > target && *dot != '.') + dot--; if (*dot == '.') dot++; nodename = tor_strndup(dot, len-5-(dot-target));; ri = router_get_by_nickname(nodename, 0); From 1c2e4d13366aee5f0107696e4d621b924a6f39a6 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sat, 24 Sep 2011 22:46:21 -0400 Subject: [PATCH 4/4] trivial whitespace changes, take two --- src/or/connection_edge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 0663787fba..6a696092eb 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -843,7 +843,7 @@ addressmap_clear_excluded_trackexithosts(or_options_t *options) continue; /* malformed. */ dot = target + len - 6; /* dot now points to just before .exit */ while (dot > target && *dot != '.') - dot--; + dot--; if (*dot == '.') dot++; nodename = tor_strndup(dot, len-5-(dot-target));; ri = router_get_by_nickname(nodename, 0);