mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-26 07:31:33 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote branch 'sebastian/bug2496'

Browse source
This commit is contained in:
Nick Mathewson 2011-02-22 14:17:11 -05:00
commit 2eadbd41f0
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/or/config.c
View file

@ -1390,10 +1390,12 @@ options_act(or_options_t *old_options)
print_notice = 1; print_notice = 1;
} else { } else {
options->DirReqStatistics = 0; options->DirReqStatistics = 0;
log_notice(LD_CONFIG, "Configured to measure directory request " /* Don't warn Tor clients, they don't use statistics */
"statistics, but no GeoIP database found! " if (options->ORPort)
"Please specify a GeoIP database using the " log_notice(LD_CONFIG, "Configured to measure directory request "
"GeoIPFile option!"); "statistics, but no GeoIP database found. "
"Please specify a GeoIP database using the "
"GeoIPFile option.");
} }
} }
if ((!old_options || !old_options->EntryStatistics) && if ((!old_options || !old_options->EntryStatistics) &&
@ -1404,9 +1406,9 @@ options_act(or_options_t *old_options)
} else { } else {
options->EntryStatistics = 0; options->EntryStatistics = 0;
log_notice(LD_CONFIG, "Configured to measure entry node " log_notice(LD_CONFIG, "Configured to measure entry node "
"statistics, but no GeoIP database found! " "statistics, but no GeoIP database found. "
"Please specify a GeoIP database using the " "Please specify a GeoIP database using the "
"GeoIPFile option!"); "GeoIPFile option.");
} }
} }
if ((!old_options || !old_options->ExitPortStatistics) && if ((!old_options || !old_options->ExitPortStatistics) &&