[or-cvs] r15182: backport r15074, r15076, r15077: When we haven't had any app (in tor/branches/tor-0_2_0-patches: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2008-06-13 00:18:26 -0400 (Fri, 13 Jun 2008)
New Revision: 15182

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/main.c
   tor/branches/tor-0_2_0-patches/src/or/routerlist.c
Log:
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.


Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-06-13 04:16:45 UTC (rev 15181)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-06-13 04:18:26 UTC (rev 15182)
@@ -19,11 +19,14 @@
     - If we change our MaxAdvertisedBandwidth and then reload torrc,
       Tor won't realize it should publish a new relay descriptor. Fixes
       bug 688, reported by mfr.
+    - While setting up a hidden service, some valid introduction circuits
+      were overlooked and abandoned. This might be the reason for
+      the long delay in making a hidden service available. Bugfix on
+      0.2.0.13-alpha.
+    - When we haven't had any application requests lately, don't bother
+      logging that we have expired a bunch of descriptors.
     - Fix unit tests in 0.2.0.27-rc.
     - Fix compile on Windows.
-    - While setting up a hidden service, some valid introduction circuits
-      were overlooked and given up.  This might be the reason for the long
-      delay in making a hidden service available.  Bugfix on 0.2.0.13-alpha.
 
 
 Changes in version 0.2.0.27-rc - 2008-06-03

Modified: tor/branches/tor-0_2_0-patches/src/or/main.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/main.c	2008-06-13 04:16:45 UTC (rev 15181)
+++ tor/branches/tor-0_2_0-patches/src/or/main.c	2008-06-13 04:18:26 UTC (rev 15182)
@@ -640,7 +640,8 @@
   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);

Modified: tor/branches/tor-0_2_0-patches/src/or/routerlist.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/routerlist.c	2008-06-13 04:16:45 UTC (rev 15181)
+++ tor/branches/tor-0_2_0-patches/src/or/routerlist.c	2008-06-13 04:18:26 UTC (rev 15182)
@@ -4188,7 +4188,9 @@
     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");
   }