Disable stats requiring geoip info if we have none

In other parts of the code we will otherwise attempt to collect these
statistics, and that will lead to crashes.
This commit is contained in:
Sebastian Hahn 2010-12-22 08:34:41 +01:00
parent cf8bffa359
commit dfdb4fde1a

View File

@ -1425,6 +1425,7 @@ options_act(or_options_t *old_options)
geoip_dirreq_stats_init(now); geoip_dirreq_stats_init(now);
print_notice = 1; print_notice = 1;
} else { } else {
options->DirReqStatistics = 0;
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 "
@ -1437,6 +1438,7 @@ options_act(or_options_t *old_options)
geoip_entry_stats_init(now); geoip_entry_stats_init(now);
print_notice = 1; print_notice = 1;
} else { } else {
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 "