Don't tell Tor client users about missing geoip

They don't need the geoip file for stats, so a missing geoipfile is not
a big issue. Also make the log message a bit friendlier. Fixes bug 2496.
This commit is contained in:
Sebastian Hahn 2011-02-06 00:25:33 +01:00
parent 69f7c0385b
commit 7736f44698

View File

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