From: Roger Dingledine <arma@torproject.org>
Date: Sun, 3 Aug 2008 05:35:18 +0000 (+0000)
Subject: note a feature (bugfix) we should do one day
X-Git-Tag: tor-0.2.1.3-alpha~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf066be6546f05cd59c54f994f9d32e012817a73;p=thirdparty%2Ftor.git

note a feature (bugfix) we should do one day


svn:r16368
---

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 9de9765d93..ebba1cdfae 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1001,15 +1001,18 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn,
 
   if (!want_onehop && !router_have_minimum_dir_info()) {
     if (!connection_get_by_type(CONN_TYPE_DIR)) {
+      int severity = LOG_NOTICE;
+      /* FFFF if this is a tunnelled directory fetch, don't yell
+       * as loudly. the user doesn't even know it's happening. */
       if (options->UseBridges && bridges_known_but_down()) {
-        log_notice(LD_APP|LD_DIR,
-                   "Application request when we're believed to be "
-                   "offline. Optimistically trying known bridges again.");
+        log_fn(severity, LD_APP|LD_DIR,
+               "Application request when we're believed to be "
+               "offline. Optimistically trying known bridges again.");
         bridges_retry_all();
       } else if (!options->UseBridges || any_bridge_descriptors_known()) {
-        log_notice(LD_APP|LD_DIR,
-                   "Application request when we're believed to be "
-                   "offline. Optimistically trying directory fetches again.");
+        log_fn(severity, LD_APP|LD_DIR,
+               "Application request when we're believed to be "
+               "offline. Optimistically trying directory fetches again.");
         routerlist_retry_directory_downloads(time(NULL));
       }
     }