summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-03-04 18:58:38 +0000
committerNick Mathewson <nickm@torproject.org>2007-03-04 18:58:38 +0000
commit70e5a83a77900121ea66a28e8743ea3b25135dea (patch)
tree7546e9b987d09856d7fd77ac71f8237f5c5f9c32 /src/or/main.c
parent5f9f62daa29a58ba855c8318f814eb527ae38066 (diff)
downloadtor-70e5a83a77900121ea66a28e8743ea3b25135dea.tar.gz
tor-70e5a83a77900121ea66a28e8743ea3b25135dea.zip
r12057@catbus: nickm | 2007-03-04 13:58:32 -0500
Clarify some log messages; note others that could be improved later. svn:r9724
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 17e1f3e74c..8594080a97 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -536,11 +536,13 @@ conn_close_if_marked(int i)
severity = LOG_INFO;
else
severity = LOG_NOTICE;
- /* XXXX012 rewrite this error message; it generates lots of worried
- * support requests. */
- log_fn(severity, LD_NET, "Something wrong with your network connection? "
- "We tried to write %d bytes to addr %s (fd %d, type %s, state %d)"
- " but timed out. (Marked at %s:%d)",
+ /* 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 "
+ "bytes to addr %s. If this happens a lot, either "
+ "something is wrong with your network connection, or "
+ "something is wrong with theirs. "
+ "(fd %d, type %s, state %d, marked at %s:%d).",
(int)buf_datalen(conn->outbuf),
escaped_safe_str(conn->address), conn->s,
conn_type_to_string(conn->type), conn->state,