aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-03-11 20:52:20 -0400
committerNick Mathewson <nickm@torproject.org>2013-03-11 20:52:20 -0400
commit805ecb8719e5e66d708f040027fecc6de56b3a5b (patch)
tree06901c74c1403600ce85fecd423e65ceca567099 /src
parent34f07ec8629a94b87fd19f93bb62d4f91286fbc6 (diff)
downloadtor-805ecb8719e5e66d708f040027fecc6de56b3a5b.tar
tor-805ecb8719e5e66d708f040027fecc6de56b3a5b.tar.gz
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.
Diffstat (limited to 'src')
-rw-r--r--src/or/control.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 03e5d79c8..5e61cd787 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 */