aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-02-09 12:50:54 -0500
committerNick Mathewson <nickm@torproject.org>2010-02-09 12:50:54 -0500
commita4065cd832dcbbe034dac1f42db7bdd315a7d734 (patch)
tree159014b56431cb76a46229960d78c797ab99fd36 /src
parent6dd71d314dfe361aab52628e54f3aa9666c115e4 (diff)
parentb2b99a70c005ae4158786d0c30b35dc6db45e9b6 (diff)
downloadtor-a4065cd832dcbbe034dac1f42db7bdd315a7d734.tar.gz
tor-a4065cd832dcbbe034dac1f42db7bdd315a7d734.zip
Merge remote branch 'sebastian/bug925'
Diffstat (limited to 'src')
-rw-r--r--src/or/connection.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index eeb25c1828..cf13345741 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -822,9 +822,9 @@ warn_too_many_conns(void)
log_warn(LD_NET,"Failing because we have %d connections already. Please "
"raise your ulimit -n.", n_conns);
last_warned = now;
+ control_event_general_status(LOG_WARN, "TOO_MANY_CONNECTIONS CURRENT=%d",
+ n_conns);
}
- control_event_general_status(LOG_WARN, "TOO_MANY_CONNECTIONS CURRENT=%d",
- n_conns);
}
/** Bind a new non-blocking socket listening to the socket described