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

			internal maximum. [RT #18460]

diff --git a/CHANGES b/CHANGES
index 6ba860404d8d855ef7475fd216e7ea5b8f8faffe..b22b621027a18cd35b13e8f7e07c5ab472cb5485 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2416.  [func]          Log file descriptors that cause exceeding the
+                       internal maximum. [RT #18460]
+
 2415.  [bug]           'rndc dumpdb' could trigger various assertion failures
                        in rbtdb.c. [RT #18455]
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index c5913f4263190c6e5714fcb9f8d7edbbfd0952a3..e600cdb17dca2606fdc8a0d685e1ff6e5c689b86 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.298 2008/08/09 19:02:10 jinmei Exp $ */
+/* $Id: socket.c,v 1.299 2008/08/13 23:44:18 jinmei Exp $ */
 
 /*! \file */
 
@@ -1874,7 +1874,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);
        }
 
@@ -2625,8 +2626,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;
                }