mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-14 15:23:27 +01:00
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:
parent
69f7c0385b
commit
7736f44698
@ -1386,10 +1386,12 @@ options_act(or_options_t *old_options)
|
|||||||
print_notice = 1;
|
print_notice = 1;
|
||||||
} else {
|
} else {
|
||||||
options->DirReqStatistics = 0;
|
options->DirReqStatistics = 0;
|
||||||
|
/* Don't warn Tor clients, they don't use statistics */
|
||||||
|
if (options->ORPort)
|
||||||
log_notice(LD_CONFIG, "Configured to measure directory request "
|
log_notice(LD_CONFIG, "Configured to measure directory request "
|
||||||
"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->EntryStatistics) &&
|
if ((!old_options || !old_options->EntryStatistics) &&
|
||||||
@ -1400,9 +1402,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) &&
|
||||||
|
Loading…
Reference in New Issue
Block a user