commit 805ecb8719e5e66d708f040027fecc6de56b3a5b Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 11 20:52:20 2013 -0400 Make control_event_bootstrap_problem always INFO when hibernating When we're hibernating, the main reqason we can't bootstrap will always be that we're hibernating: reporting anything else at severity WARN is pointless. Fixes part of 7302. --- changes/bug7302 | 8 +++++++- src/or/control.c | 3 +++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/bug7302 b/changes/bug7302 index 2949e40..fec615f 100644 --- a/changes/bug7302 +++ b/changes/bug7302 @@ -2,4 +2,10 @@ - Don't log inappropriate heartbeat messages when hibernating: a hibernating node is _expected_ to drop out of the consensus, decide it isn't bootstrapped, and so forth. Fixes part of bug - #7302; bugfix on 0.2.3.1-alpha. + 7302; bugfix on 0.2.3.1-alpha. + + - Don't complain about bootstrapping problems while hibernating. + These complaints reflect a general code problems, but not one + with any problematic effects. (No connections are actually + opened.) Fixes part of bug 7302; bugfix on 0.2.3.2-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 03e5d79..5e61cd7 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4717,6 +4717,9 @@ control_event_bootstrap_problem(const char *warn, int reason) !any_pending_bridge_descriptor_fetches()) recommendation = "warn"; + if (we_are_hibernating()) + recommendation = "ignore"; + while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0) status--; /* find a recognized status string based on current progress */ status = bootstrap_percent; /* set status back to the actual number */