瀏覽代碼

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

Resolves ticket 5286.
Nick Mathewson 10 年之前
父節點
當前提交
a790454368
共有 2 個文件被更改,包括 5 次插入10 次删除
  1. 4 0
      changes/bug5286
  2. 1 10
      src/or/main.c

+ 4 - 0
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.

+ 1 - 10
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. "