From: rl1987 <rl1987@sdf.lonestar.org>
Date: Sun, 26 Oct 2014 14:45:15 +0000 (+0200)
Subject: Updating message that warns about running out of sockets we can use.
X-Git-Tag: tor-0.2.6.1-alpha~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14d59fdc1009dcbcbf6e30c9eee7c3333d68fbd7;p=thirdparty%2Ftor.git

Updating message that warns about running out of sockets we can use.
---

diff --git a/src/or/connection.c b/src/or/connection.c
index 5c1b6d9bba..a2aad6fb48 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -894,9 +894,9 @@ create_unix_sockaddr(const char *listenaddress, char **readable_address,
 }
 #endif /* HAVE_SYS_UN_H */
 
-/** Warn that an accept or a connect has failed because we're running up
- * against our ulimit.  Rate-limit these warnings so that we don't spam
- * the log. */
+/** Warn that an accept or a connect has failed because we're running out of
+ * TCP sockets we can use on current system.  Rate-limit these warnings so
+ * that we don't spam the log. */
 static void
 warn_too_many_conns(void)
 {
@@ -906,7 +906,7 @@ warn_too_many_conns(void)
   if ((m = rate_limit_log(&last_warned, approx_time()))) {
     int n_conns = get_n_open_sockets();
     log_warn(LD_NET,"Failing because we have %d connections already. Please "
-             "raise your ulimit -n.%s", n_conns, m);
+             "read doc/TUNING for guidance.%s", n_conns, m);
     tor_free(m);
     control_event_general_status(LOG_WARN, "TOO_MANY_CONNECTIONS CURRENT=%d",
                                  n_conns);