Author: markt
Date: Wed Sep 29 15:36:54 2010
New Revision: 1002683
URL: http://svn.apache.org/viewvc?rev=1002683&view=rev
Log:
Refactor logging
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1002683&r1=1002682&r2=1002683&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed
Sep 29 15:36:54 2010
@@ -40,7 +40,6 @@ import org.apache.coyote.http11.filters.
import org.apache.coyote.http11.filters.VoidInputFilter;
import org.apache.coyote.http11.filters.VoidOutputFilter;
import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.Ascii;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -53,10 +52,7 @@ import org.apache.tomcat.util.res.String
public abstract class AbstractHttp11Processor {
- /**
- * Logger.
- */
- private static final Log log =
LogFactory.getLog(AbstractHttp11Processor.class);
+ protected abstract Log getLog();
/**
* The string manager for this package.
@@ -284,7 +280,7 @@ public abstract class AbstractHttp11Proc
noCompressionUserAgents =
addREArray(noCompressionUserAgents, nRule);
} catch (PatternSyntaxException pse) {
- log.error(sm.getString("http11processor.regexp.error", userAgent),
pse);
+ getLog().error(sm.getString("http11processor.regexp.error",
userAgent), pse);
}
}
@@ -454,7 +450,7 @@ public abstract class AbstractHttp11Proc
Pattern nRule = Pattern.compile(userAgent);
restrictedUserAgents = addREArray(restrictedUserAgents, nRule);
} catch (PatternSyntaxException pse) {
- log.error(sm.getString("http11processor.regexp.error", userAgent),
pse);
+ getLog().error(sm.getString("http11processor.regexp.error",
userAgent), pse);
}
}
@@ -806,11 +802,11 @@ public abstract class AbstractHttp11Proc
} else if (obj instanceof OutputFilter) {
getOutputBuffer().addFilter((OutputFilter) obj);
} else {
- log.warn(sm.getString("http11processor.filter.unknown",
+ getLog().warn(sm.getString("http11processor.filter.unknown",
className));
}
} catch (Exception e) {
- log.error(sm.getString(
+ getLog().error(sm.getString(
"http11processor.filter.error", className), e);
}
}
@@ -1098,7 +1094,7 @@ public abstract class AbstractHttp11Proc
error = true;
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log.error(sm.getString("http11processor.request.finish"), t);
+ getLog().error(sm.getString("http11processor.request.finish"), t);
// 500 - Internal Server Error
response.setStatus(500);
adapter.log(request, response, 0);
@@ -1110,7 +1106,7 @@ public abstract class AbstractHttp11Proc
error = true;
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log.error(sm.getString("http11processor.response.finish"), t);
+ getLog().error(sm.getString("http11processor.response.finish"), t);
error = true;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1002683&r1=1002682&r2=1002683&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Wed Sep
29 15:36:54 2010
@@ -58,10 +58,11 @@ import org.apache.tomcat.util.net.Socket
public class Http11AprProcessor extends AbstractHttp11Processor implements
ActionHook {
- /**
- * Logger.
- */
private static final Log log = LogFactory.getLog(Http11AprProcessor.class);
+ @Override
+ protected Log getLog() {
+ return log;
+ }
// ----------------------------------------------------------- Constructors
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1002683&r1=1002682&r2=1002683&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Wed Sep
29 15:36:54 2010
@@ -54,10 +54,11 @@ import org.apache.tomcat.util.net.Socket
*/
public class Http11NioProcessor extends AbstractHttp11Processor implements
ActionHook {
- /**
- * Logger.
- */
private static final Log log = LogFactory.getLog(Http11NioProcessor.class);
+ @Override
+ protected Log getLog() {
+ return log;
+ }
/**
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1002683&r1=1002682&r2=1002683&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Sep 29
15:36:54 2010
@@ -53,10 +53,11 @@ import org.apache.tomcat.util.net.Socket
*/
public class Http11Processor extends AbstractHttp11Processor implements
ActionHook {
- /**
- * Logger.
- */
private static final Log log = LogFactory.getLog(Http11Processor.class);
+ @Override
+ protected Log getLog() {
+ return log;
+ }
// ------------------------------------------------------------ Constructor
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
