Commit cf225ed6 authored by Tatuya JINMEI 神明達哉's avatar Tatuya JINMEI 神明達哉
Browse files

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

			internal maximum. [RT #18460]
parent 52d5489b
2416. [func] Log file descriptors that cause exceeding the
internal maximum. [RT #18460]
2415. [bug] 'rndc dumpdb' could trigger various assertion failures 2415. [bug] 'rndc dumpdb' could trigger various assertion failures
in rbtdb.c. [RT #18455] in rbtdb.c. [RT #18455]
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 */ /*! \file */
...@@ -1874,7 +1874,8 @@ opensocket(isc_socketmgr_t *manager, isc_socket_t *sock) { ...@@ -1874,7 +1874,8 @@ opensocket(isc_socketmgr_t *manager, isc_socket_t *sock) {
ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR, ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR,
isc_msgcat, ISC_MSGSET_SOCKET, isc_msgcat, ISC_MSGSET_SOCKET,
ISC_MSG_TOOMANYFDS, 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); return (ISC_R_NORESOURCES);
} }
...@@ -2625,8 +2626,9 @@ internal_accept(isc_task_t *me, isc_event_t *ev) { ...@@ -2625,8 +2626,9 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR, ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR,
isc_msgcat, ISC_MSGSET_SOCKET, isc_msgcat, ISC_MSGSET_SOCKET,
ISC_MSG_TOOMANYFDS, ISC_MSG_TOOMANYFDS,
"%s: too many open file descriptors", "accept: "
"accept"); "file descriptor exceeds limit (%d/%u)",
fd, manager->maxsocks);
(void)close(fd); (void)close(fd);
goto soft_error; goto soft_error;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment