Author: mturk
Date: Fri Sep 17 13:04:46 2010
New Revision: 998109
URL: http://svn.apache.org/viewvc?rev=998109&view=rev
Log:
Unify socket descriptor logging
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=998109&r1=998108&r2=998109&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Fri Sep 17 13:04:46 2010
@@ -981,7 +981,7 @@ int jk_is_input_event(jk_sock_t sd, int
if (rc == 0) {
if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
- "timeout during poll on socket sd = %d (timeout=%d)",
+ "timeout during poll on socket %d (timeout=%d)",
sd, timeout);
}
/* Timeout. Set the errno to timeout */
@@ -993,7 +993,7 @@ int jk_is_input_event(jk_sock_t sd, int
save_errno = errno;
if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
- "error during poll on socket sd = %d (errno=%d)", sd,
errno);
+ "error during poll on socket %d (errno=%d)", sd, errno);
}
errno = save_errno;
JK_TRACE_EXIT(l);
@@ -1003,7 +1003,7 @@ int jk_is_input_event(jk_sock_t sd, int
save_errno = fds.revents & (POLLERR | POLLHUP);
if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
- "error event during poll on socket sd = %d (event=%d)",
+ "error event during poll on socket %d (event=%d)",
sd, save_errno);
}
errno = save_errno;
@@ -1037,7 +1037,7 @@ int jk_is_input_event(jk_sock_t sd, int
if (rc == 0) {
if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
- "timeout during select on socket sd = %d (timeout=%d)",
+ "timeout during select on socket %d (timeout=%d)",
sd, timeout);
}
/* Timeout. Set the errno to timeout */
@@ -1053,7 +1053,7 @@ int jk_is_input_event(jk_sock_t sd, int
save_errno = errno;
if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
- "error during select on socket sd = %d (errno=%d)",
+ "error during select on socket %d (errno=%d)",
sd, errno);
}
errno = save_errno;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
