costin 02/04/25 16:13:24
Modified: jk/java/org/apache/jk/common ChannelSocket.java
ChannelUn.java JniHandler.java
jk/java/org/apache/jk/server JkCoyoteHandler.java
JkMain.java
Log:
Fewer messages, more info.
We can remove even more - but I would like to keep at least one line
for each endpoint that is listening.
Revision Changes Path
1.11 +1 -1
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChannelSocket.java 23 Apr 2002 16:25:04 -0000 1.10
+++ ChannelSocket.java 25 Apr 2002 23:13:24 -0000 1.11
@@ -214,7 +214,7 @@
log.error("Can't find free port " + startPort + " " + maxPort );
return;
}
- log.info("Init " + port );
+ log.info("JK: listening on tcp port " + 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.17 +2 -2
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java
Index: ChannelUn.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelUn.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChannelUn.java 25 Apr 2002 22:04:00 -0000 1.16
+++ ChannelUn.java 25 Apr 2002 23:13:24 -0000 1.17
@@ -128,7 +128,7 @@
public void init() throws IOException {
apr=(AprImpl)wEnv.getHandler("apr");
if( apr==null || ! apr.isLoaded() ) {
- log.error("Apr is not available, disabling unix channel ");
+ log.debug("Apr is not available, disabling unix channel ");
apr=null;
return;
}
@@ -163,7 +163,7 @@
if (unixListenSocket<0)
throw(new IOException("Cannot create listening socket " + file));
- log.info("Listening on unix socket: " + file );
+ log.info("JK: listening on unix socket: " + file );
// Run a thread that will accept connections.
tp.start();
1.3 +3 -2
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java
Index: JniHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JniHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JniHandler.java 25 Apr 2002 22:44:23 -0000 1.2
+++ JniHandler.java 25 Apr 2002 23:13:24 -0000 1.3
@@ -114,7 +114,8 @@
protected void initNative(String nativeComponentName) {
apr=(AprImpl)wEnv.getHandler("apr");
if( apr==null || ! apr.isLoaded() ) {
- log.error("No apr, disabling jni proxy ");
+ if( log.isDebugEnabled() )
+ log.debug("No apr, disabling jni proxy ");
apr=null;
return;
}
@@ -126,7 +127,7 @@
log.info("Component not found, creating it " + nativeComponentName );
nativeJkHandlerP=apr.createJkHandler(xEnv, nativeComponentName);
}
- log.info("Native proxy " + nativeJkHandlerP );
+ log.debug("Native proxy " + nativeJkHandlerP );
apr.releaseJkEnv(xEnv);
}
1.18 +2 -3
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JkCoyoteHandler.java 25 Apr 2002 18:27:18 -0000 1.17
+++ JkCoyoteHandler.java 25 Apr 2002 23:13:24 -0000 1.18
@@ -94,7 +94,8 @@
protected JkMain jkMain=new JkMain();
public void setProperty( String name, String value ) {
- log.info("setProperty " + name + " " + value );
+ if( log.isDebugEnabled())
+ log.debug("setProperty " + name + " " + value );
jkMain.setProperty( name, value );
properties.put( name, value );
}
@@ -139,8 +140,6 @@
jkMain.init();
jkMain.start();
-
- log.info("Jk2 started ");
headersMsgNote=wEnv.getNoteId( WorkerEnv.ENDPOINT_NOTE, "headerMsg" );
utfC2bNote=wEnv.getNoteId( WorkerEnv.ENDPOINT_NOTE, "utfC2B" );
1.23 +5 -5
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java
Index: JkMain.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JkMain.java 24 Apr 2002 19:45:09 -0000 1.22
+++ JkMain.java 25 Apr 2002 23:13:24 -0000 1.23
@@ -207,7 +207,6 @@
// XXX use IntrospectionUtil to find myself
this.guessHome();
}
- log.info("Jk2 home " + home );
if( home != null ) {
File hF=new File(home);
File conf=new File( home, "conf" );
@@ -217,9 +216,10 @@
File propsF=new File( conf, "jk2.properties" );
if( propsF.exists() ) {
- log.info("Jk2 conf " + propsF );
+ log.info("Starting Jk2, base dir= " + home + " conf=" + propsF );
setPropertiesFile( propsF.getAbsolutePath());
} else {
+ log.info("Starting Jk2, base dir= " + home );
if( log.isWarnEnabled() )
log.warn( "No properties file found " + propsF );
}
@@ -284,9 +284,9 @@
wEnv.getHandler(i).init();
} catch( IOException ex) {
if( "apr".equals(wEnv.getHandler(i).getName() )) {
- log.error( "WorkerEnv: APR not initialized " +
ex.toString());
+ log.error( "APR error, disabling jni components: " +
ex.toString());
} else {
- log.error( "WorkerEnv: error initializing " +
wEnv.getHandler(i).getName(), ex );
+ log.error( "error initializing " +
wEnv.getHandler(i).getName(), ex );
}
}
}
@@ -370,7 +370,7 @@
public void saveProperties() {
// Temp - to check if it works
String outFile=propFile + ".save";
- log.info("Saving properties " + outFile );
+ log.debug("Saving properties " + outFile );
try {
props.save( new FileOutputStream(outFile), "AUTOMATICALLY GENERATED" );
} catch(IOException ex ){
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
