aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-04-09 21:36:37 +0000
committerRoger Dingledine <arma@torproject.org>2006-04-09 21:36:37 +0000
commit21263982e436601c9a4ae538413a5e2869e92f52 (patch)
tree97355740005e481694e00a31a27a4c91e78f3b33 /src/or/circuituse.c
parentb6b534c9dd34d9b4726321662c61b07cb2730bfa (diff)
downloadtor-21263982e436601c9a4ae538413a5e2869e92f52.tar.gz
tor-21263982e436601c9a4ae538413a5e2869e92f52.zip
Don't yell loudly about failed internal/bridge connections. These
are reachability testing and rendserv upload/downloads, and they have their own failure messages elsewhere. svn:r6343
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 57cc538733..1d79e62cf7 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1136,6 +1136,7 @@ connection_ap_handshake_attach_circuit(connection_t *conn)
{
int retval;
int conn_age;
+ int severity;
tor_assert(conn);
tor_assert(conn->type == CONN_TYPE_AP);
@@ -1143,11 +1144,12 @@ connection_ap_handshake_attach_circuit(connection_t *conn)
tor_assert(conn->socks_request);
conn_age = time(NULL) - conn->timestamp_created;
+ severity = (!conn->addr && !conn->port) ? LOG_INFO : LOG_NOTICE;
if (conn_age > get_options()->SocksTimeout) {
- log_notice(LD_APP,
- "Tried for %d seconds to get a connection to %s:%d. Giving up.",
- conn_age, safe_str(conn->socks_request->address),
- conn->socks_request->port);
+ log_fn(severity, LD_APP,
+ "Tried for %d seconds to get a connection to %s:%d. Giving up.",
+ conn_age, safe_str(conn->socks_request->address),
+ conn->socks_request->port);
return -1;
}