pero 2005/01/29 11:29:55
Modified: http11/src/java/org/apache/coyote/http11 Http11Protocol.java
jk/java/org/apache/jk/common ChannelSocket.java
HandlerRequest.java
util/java/org/apache/tomcat/util/net/res
LocalStrings.properties
Log:
Change some log.isXXXEnable
Revision Changes Path
1.62 +10 -5
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java
Index: Http11Protocol.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- Http11Protocol.java 6 Dec 2004 13:59:28 -0000 1.61
+++ Http11Protocol.java 29 Jan 2005 19:29:54 -0000 1.62
@@ -144,7 +144,8 @@
log.error(sm.getString("http11protocol.endpoint.initerror"), ex);
throw ex;
}
- log.info(sm.getString("http11protocol.init", getName()));
+ if(log.isInfoEnabled())
+ log.info(sm.getString("http11protocol.init", getName()));
}
@@ -183,7 +184,8 @@
log.error(sm.getString("http11protocol.endpoint.starterror"),
ex);
throw ex;
}
- log.info(sm.getString("http11protocol.start", getName()));
+ if(log.isInfoEnabled())
+ log.info(sm.getString("http11protocol.start", getName()));
}
public void pause() throws Exception {
@@ -193,7 +195,8 @@
log.error(sm.getString("http11protocol.endpoint.pauseerror"),
ex);
throw ex;
}
- log.info(sm.getString("http11protocol.pause", getName()));
+ if(log.isInfoEnabled())
+ log.info(sm.getString("http11protocol.pause", getName()));
}
public void resume() throws Exception {
@@ -203,11 +206,13 @@
log.error(sm.getString("http11protocol.endpoint.resumeerror"),
ex);
throw ex;
}
- log.info(sm.getString("http11protocol.resume", getName()));
+ if(log.isInfoEnabled())
+ log.info(sm.getString("http11protocol.resume", getName()));
}
public void destroy() throws Exception {
- log.info(sm.getString("http11protocol.stop", getName()));
+ if(log.isInfoEnabled())
+ log.info(sm.getString("http11protocol.stop", getName()));
ep.stopEndpoint();
if( tpOname!=null )
Registry.getRegistry(null, null).unregisterComponent(tpOname);
1.52 +6 -3
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
Index: ChannelSocket.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChannelSocket.java 11 Jan 2005 13:37:46 -0000 1.51
+++ ChannelSocket.java 29 Jan 2005 19:29:55 -0000 1.52
@@ -335,7 +335,8 @@
// Find a port.
if (startPort == 0) {
port = 0;
- log.info("JK2: ajp13 disabling channelSocket");
+ if(log.isInfoEnabled())
+ log.info("JK2: ajp13 disabling channelSocket");
running = true;
return;
}
@@ -351,7 +352,8 @@
port=i;
break;
} catch( IOException ex ) {
- log.info("Port busy " + i + " " + ex.toString());
+ if(log.isInfoEnabled())
+ log.info("Port busy " + i + " " + ex.toString());
continue;
}
}
@@ -360,7 +362,8 @@
log.error("Can't find free port " + startPort + " " + maxPort );
return;
}
- log.info("JK2: ajp13 listening on " + getAddress() + ":" + port );
+ if(log.isInfoEnabled())
+ log.info("JK2: ajp13 listening on " + getAddress() + ":" + port
);
// If this is not the base port and we are the 'main' channleSocket
and
// SHM didn't already set the localId - we'll set the instance id
1.43 +6 -4
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java
Index: HandlerRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- HandlerRequest.java 11 Jan 2005 13:37:46 -0000 1.42
+++ HandlerRequest.java 29 Jan 2005 19:29:55 -0000 1.43
@@ -320,8 +320,8 @@
FileOutputStream stopF=new FileOutputStream( sf );
props.store( stopF, "Automatically generated, don't edit" );
} catch( IOException ex ) {
- log.debug( "Can't create stop file: "+sf );
- ex.printStackTrace();
+ if(log.isDebugEnabled())
+ log.debug( "Can't create stop file: "+sf,ex );
}
}
@@ -420,7 +420,8 @@
checkRequest(ep);
next.invoke( msg, ep );
- log.info("Exiting");
+ if(log.isInfoEnabled())
+ log.info("Exiting");
System.exit(0);
return OK;
@@ -437,7 +438,8 @@
return OK;
default:
- log.info("Unknown message " + type);
+ if(log.isInfoEnabled())
+ log.info("Unknown message " + type);
}
return OK;
1.6 +2 -1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/res/LocalStrings.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LocalStrings.properties 5 Oct 2004 22:16:20 -0000 1.5
+++ LocalStrings.properties 29 Jan 2005 19:29:55 -0000 1.6
@@ -9,4 +9,5 @@
endpoint.err.unexpected=Unexpected error processing socket
endpoint.warn.nullSocket=Null socket returned by accept
endpoint.debug.unlock=Caught exception trying to unlock accept on port {0}
-endpoint.err.close=Caught exception trying to close socket
\ No newline at end of file
+endpoint.err.close=Caught exception trying to close socket
+endpoint.noProcessor=No Processors - worker thread dead!
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
