backport r15074, r15076, r15077:

When we haven't had any application requests lately, don't bother
logging that we have expired a bunch of descriptors.


svn:r15182

2 files changed, 5 insertions, 2 deletions

diff --git a/src/or/main.c b/src/or/main.c
index 198bcf9129..e0b9f6ebbf 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -640,7 +640,8 @@ directory_info_has_arrived(time_t now, int from_cache)
   or_options_t *options = get_options();
 
   if (!router_have_minimum_dir_info()) {
-    log(LOG_NOTICE, LD_DIR,
+    int quiet = 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());
     update_router_descriptor_downloads(now);
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 72f5a8d896..5d2c65cd11 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4188,7 +4188,9 @@ update_router_have_minimum_dir_info(void)
     control_event_client_status(LOG_NOTICE, "ENOUGH_DIR_INFO");
   }
   if (!res && have_min_dir_info) {
-    log(LOG_NOTICE, LD_DIR,"Our directory information is no longer up-to-date "
+    int quiet = directory_too_idle_to_fetch_descriptors(options, now);
+    log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR,
+        "Our directory information is no longer up-to-date "
         "enough to build circuits: %s", dir_info_status);
     control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO");
   }