nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make control_event_bootstrap_problem always INFO when hibernating

Browse Source 
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.
This commit is contained in:
Nick Mathewson 2013-03-11 20:52:20 -04:00
parent 34f07ec862
commit 805ecb8719
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changes/bug7302
View File

@ -2,4 +2,10 @@
- Don't log inappropriate heartbeat messages when hibernating: a - Don't log inappropriate heartbeat messages when hibernating: a
hibernating node is _expected_ to drop out of the consensus, hibernating node is _expected_ to drop out of the consensus,
decide it isn't bootstrapped, and so forth. Fixes part of bug 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.

3
src/or/control.c
View File

@ -4717,6 +4717,9 @@ control_event_bootstrap_problem(const char *warn, int reason)
!any_pending_bridge_descriptor_fetches()) !any_pending_bridge_descriptor_fetches())
recommendation = "warn"; recommendation = "warn";
if (we_are_hibernating())
recommendation = "ignore";
while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0) while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0)
status--; /* find a recognized status string based on current progress */ status--; /* find a recognized status string based on current progress */
status = bootstrap_percent; /* set status back to the actual number */ status = bootstrap_percent; /* set status back to the actual number */