diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-03-22 20:04:00 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-03-22 20:04:00 +0000 |
| commit | 8a763b5ae3119dbebba1887bb31ccc82bfd88e46 (patch) | |
| tree | 9344bb42733163a70eb3f9d77b5e8c0fc509d872 /src/or/main.c | |
| parent | 7a0072cc1a70b42dd38c58ac20fe873c48beeace (diff) | |
| download | tor-8a763b5ae3119dbebba1887bb31ccc82bfd88e46.tar.gz tor-8a763b5ae3119dbebba1887bb31ccc82bfd88e46.zip | |
cleanup and a question
svn:r3815
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c index dfa8ae6d00..c26d4f03cc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -681,19 +681,20 @@ static void run_connection_housekeeping(int i, time_t now) { conn->hold_open_until_flushed = 1; } else if (we_are_hibernating() && !circuit_get_by_conn(conn) && !buf_datalen(conn->outbuf)) { - log_fn(LOG_INFO,"Expiring non-used OR connection to %d (%s:%d). [Hibernating.]", + log_fn(LOG_INFO,"Expiring non-used OR connection to %d (%s:%d) [Hibernating or exiting].", i,conn->address, conn->port); connection_mark_for_close(conn); conn->hold_open_until_flushed = 1; } else if (!clique_mode(options) && !circuit_get_by_conn(conn) && (!router || !server_mode(options) || !router_is_clique_mode(router))) { - log_fn(LOG_INFO,"Expiring non-used connection to %d (%s:%d). [Not in clique mode]", + log_fn(LOG_INFO,"Expiring non-used connection to %d (%s:%d) [Not in clique mode].", i,conn->address, conn->port); connection_mark_for_close(conn); conn->hold_open_until_flushed = 1; } else if (buf_datalen(conn->outbuf) && +// XXX will this have races were stuff just got written to the conn and we kill it? now >= conn->timestamp_lastwritten + options->KeepalivePeriod*10) { - log_fn(LOG_INFO,"Expiriing stuck connection to %d (%s:%d).", + log_fn(LOG_INFO,"Expiring stuck connection to %d (%s:%d).", i, conn->address, conn->port); connection_mark_for_close(conn); } else { |