]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
quiet "I learned some more directory information" on startup
authorRoger Dingledine <arma@torproject.org>
Mon, 3 Sep 2012 23:49:44 +0000 (19:49 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 3 Sep 2012 23:49:44 +0000 (19:49 -0400)
Reserve it for when new directory information arrives in response to
a fetch.

Resolves ticket 6760.

changes/feature6760 [new file with mode: 0644]
src/or/main.c

diff --git a/changes/feature6760 b/changes/feature6760
new file mode 100644 (file)
index 0000000..cd94d4e
--- /dev/null
@@ -0,0 +1,6 @@
+  o Minor features:
+    - Don't log "I learned some more directory information" when we're
+      reading cached directory information. Reserve it for when new
+      directory information arrives in response to a fetch. Resolves
+      ticket 6760.
+
index 20a1e086a4440aee6a5529b777cfb1dd4cb32766..f3b781ec2fc99fbeb10e6f41f389568483ea679a 100644 (file)
@@ -953,7 +953,8 @@ directory_info_has_arrived(time_t now, int from_cache)
   const or_options_t *options = get_options();
 
   if (!router_have_minimum_dir_info()) {
-    int quiet = directory_too_idle_to_fetch_descriptors(options, now);
+    int quiet = from_cache ||
+                directory_too_idle_to_fetch_descriptors(options, now);
     log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR,
         "I learned some more directory information, but not enough to "
         "build a circuit: %s", get_dir_info_status_string());