Author: remy.maucherat(a)jboss.com
Date: 2013-06-10 07:56:39 -0400 (Mon, 10 Jun 2013)
New Revision: 2217
Modified:
branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java
branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java
branches/8.0.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java
branches/8.0.x/src/main/java/org/jboss/web/CoyoteLogger.java
Log:
Port BZ 50273 fix: filtering out accept errors on HPUX. Downside is that a string has to
be added ...
Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2013-06-10
07:37:32 UTC (rev 2216)
+++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2013-06-10
11:56:39 UTC (rev 2217)
@@ -1142,7 +1142,21 @@
Socket.destroy(socket);
}
} catch (Throwable t) {
- CoyoteLogger.UTIL_LOGGER.errorAcceptingSocket(t);
+ if (running) {
+ if (t instanceof Error) {
+ Error e = (Error) t;
+ if (e.getError() == 233) {
+ // Not an error on HP-UX so log as a warning
+ // so it can be filtered out on that platform
+ // See bug 50273
+ CoyoteLogger.UTIL_LOGGER.warnAcceptingSocket(t);
+ } else {
+ CoyoteLogger.UTIL_LOGGER.errorAcceptingSocket(t);
+ }
+ } else {
+ CoyoteLogger.UTIL_LOGGER.errorAcceptingSocket(t);
+ }
+ }
}
}
Modified: branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java
===================================================================
--- branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java 2013-06-10 07:37:32 UTC
(rev 2216)
+++ branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java 2013-06-10 11:56:39 UTC
(rev 2217)
@@ -495,4 +495,8 @@
@Message(id = 3104, value = "Error registering MBean %s")
void errorRegisteringMbean(Object objectName, @Cause Throwable t);
+ @LogMessage(level = WARN)
+ @Message(id = 3105, value = "Socket accept failed")
+ void warnAcceptingSocket(@Cause Throwable exception);
+
}
Modified: branches/8.0.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java
===================================================================
--- branches/8.0.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2013-06-10
07:37:32 UTC (rev 2216)
+++ branches/8.0.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2013-06-10
11:56:39 UTC (rev 2217)
@@ -1142,7 +1142,21 @@
Socket.destroy(socket);
}
} catch (Throwable t) {
- CoyoteLogger.UTIL_LOGGER.errorAcceptingSocket(t);
+ if (running) {
+ if (t instanceof Error) {
+ Error e = (Error) t;
+ if (e.getError() == 233) {
+ // Not an error on HP-UX so log as a warning
+ // so it can be filtered out on that platform
+ // See bug 50273
+ CoyoteLogger.UTIL_LOGGER.warnAcceptingSocket(t);
+ } else {
+ CoyoteLogger.UTIL_LOGGER.errorAcceptingSocket(t);
+ }
+ } else {
+ CoyoteLogger.UTIL_LOGGER.errorAcceptingSocket(t);
+ }
+ }
}
}
Modified: branches/8.0.x/src/main/java/org/jboss/web/CoyoteLogger.java
===================================================================
--- branches/8.0.x/src/main/java/org/jboss/web/CoyoteLogger.java 2013-06-10 07:37:32 UTC
(rev 2216)
+++ branches/8.0.x/src/main/java/org/jboss/web/CoyoteLogger.java 2013-06-10 11:56:39 UTC
(rev 2217)
@@ -495,4 +495,8 @@
@Message(id = 3104, value = "Error registering MBean %s")
void errorRegisteringMbean(Object objectName, @Cause Throwable t);
+ @LogMessage(level = WARN)
+ @Message(id = 3105, value = "Socket accept failed")
+ void warnAcceptingSocket(@Cause Throwable exception);
+
}
Show replies by date