aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-08-03 05:35:18 +0000
committerRoger Dingledine <arma@torproject.org>2008-08-03 05:35:18 +0000
commitbf066be6546f05cd59c54f994f9d32e012817a73 (patch)
tree6657422fc110f0945e57d43fa13fe4177f0e88ed
parentd2dd63598f1e837c1f3d4e4cd5fa59629d5d4539 (diff)
downloadtor-bf066be6546f05cd59c54f994f9d32e012817a73.tar.gz
tor-bf066be6546f05cd59c54f994f9d32e012817a73.zip
note a feature (bugfix) we should do one day
svn:r16368
-rw-r--r--src/or/circuituse.c15
1 files changed, 9 insertions, 6 deletions
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));
}
}