[tor-commits] [tor/master] Don't tell Tor client users about missing geoip

[nickm at torproject.org]

commit 7736f44698798111be413ca3285a77ce1e4d6b0c
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Sun Feb 6 00:25:33 2011 +0100

    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.
---
 src/or/config.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 1fa8466..1dc042d 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -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) &&