commit a7904543689917d0087ea47ad3d3c1631cdd2bde Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 9 11:34:00 2014 -0400

Demote "we stalled too much while trying to write" message to INFO

Resolves ticket 5286. --- changes/bug5286 | 4 ++++ src/or/main.c | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/changes/bug5286 b/changes/bug5286 new file mode 100644 index 0000000..de02a9a --- /dev/null +++ b/changes/bug5286 @@ -0,0 +1,4 @@ + o Minor features: + - Demote the message that we give when a flushing connection times + out for too long from NOTICE to INFO. It was usually meaningless. + Resolves ticket 5286. diff --git a/src/or/main.c b/src/or/main.c index 86f3437..c6619fe 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -919,16 +919,7 @@ conn_close_if_marked(int i) return 0; } if (connection_wants_to_flush(conn)) { - int severity; - if (conn->type == CONN_TYPE_EXIT || - (conn->type == CONN_TYPE_OR && server_mode(get_options())) || - (conn->type == CONN_TYPE_DIR && conn->purpose == DIR_PURPOSE_SERVER)) - severity = LOG_INFO; - else - severity = LOG_NOTICE; - /* XXXX Maybe allow this to happen a certain amount per hour; it usually - * is meaningless. */ - log_fn(severity, LD_NET, "We stalled too much while trying to write %d " + log_fn(LOG_INFO, LD_NET, "We stalled too much while trying to write %d " "bytes to address %s. If this happens a lot, either " "something is wrong with your network connection, or " "something is wrong with theirs. "