2416. [func] Log file descriptors that cause exceeding the

			internal maximum. [RT #18460]

diff --git a/CHANGES b/CHANGES
index f7c9d9fd238dfd13f83d6c81e6a2d0814c06435b..1588aeee570dbfeb63654cc6a20f7a750c84561c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2416.  [func]          Log file descriptors that cause exceeding the
+                       internal maximum. [RT #18460]
+
 2414.  [bug]           A masterdump context held the database lock too long,
                        causing various troubles such as dead lock and
                        recursive lock acquisition. [RT #18311, #18456]

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index c19a67f1cf49098d37bd5331101c790f275ec480..c4e6cc21754280fba62af390811fabe3ec4540a1 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.207.2.19.2.52 2008/08/09 19:04:23 jinmei Exp $ */
+/* $Id: socket.c,v 1.207.2.19.2.53 2008/08/13 23:46:58 jinmei Exp $ */
 
 #include <config.h>
 
@@ -1824,7 +1824,8 @@ opensocket(isc_socketmgr_t *manager, isc_socket_t *sock) {
                               ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR,
                               isc_msgcat, ISC_MSGSET_SOCKET,
                               ISC_MSG_TOOMANYFDS,
-                              "%s: too many open file descriptors", "socket");
+                              "socket: file descriptor exceeds limit (%d/%u)",
+                              sock->fd, manager->maxsocks);
                return (ISC_R_NORESOURCES);
        }
 
@@ -2471,8 +2472,9 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
                                       ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR,
                                       isc_msgcat, ISC_MSGSET_SOCKET,
                                       ISC_MSG_TOOMANYFDS,
-                                      "%s: too many open file descriptors",
-                                      "accept");
+                                      "accept: "
+                                      "file descriptor exceeds limit (%d/%u)",
+                                      fd, manager->maxsocks);
                        (void)close(fd);
                        goto soft_error;
                }