You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2003/04/23 18:14:14 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteConnector.java
jfarcand 2003/04/23 09:14:13
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java StandardEngine.java
StandardHost.java
catalina/src/share/org/apache/catalina/logger
LoggerBase.java
catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
catalina/src/share/org/apache/catalina/realm RealmBase.java
catalina/src/share/org/apache/catalina/session
ManagerBase.java
catalina/src/share/org/apache/catalina/startup
TldConfig.java
catalina/src/share/org/apache/catalina/valves ValveBase.java
catalina/src/share/org/apache/coyote/tomcat5
CoyoteConnector.java
Log:
Reduce INFO verbosity since the JMX implementation is currently stable. The current log contains a lot of info that complexify user experience :-). I have changed info to debug.
Let me know if that cause problems.
Revision Changes Path
1.42 +12 -12 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- StandardContext.java 20 Apr 2003 17:18:56 -0000 1.41
+++ StandardContext.java 23 Apr 2003 16:14:06 -0000 1.42
@@ -987,7 +987,7 @@
String loginPage = config.getLoginPage();
if ((loginPage != null) && !loginPage.startsWith("/")) {
if (isServlet22()) {
- log.info(sm.getString("standardContext.loginConfig.loginWarning",
+ log.debug(sm.getString("standardContext.loginConfig.loginWarning",
loginPage));
config.setLoginPage("/" + loginPage);
} else {
@@ -999,7 +999,7 @@
String errorPage = config.getErrorPage();
if ((errorPage != null) && !errorPage.startsWith("/")) {
if (isServlet22()) {
- log.info(sm.getString("standardContext.loginConfig.errorWarning",
+ log.debug(sm.getString("standardContext.loginConfig.errorWarning",
errorPage));
config.setErrorPage("/" + errorPage);
} else {
@@ -1488,7 +1488,7 @@
String jspFile = wrapper.getJspFile();
if ((jspFile != null) && !jspFile.startsWith("/")) {
if (isServlet22()) {
- log.info(sm.getString("standardContext.wrapper.warning", jspFile));
+ log.debug(sm.getString("standardContext.wrapper.warning", jspFile));
wrapper.setJspFile("/" + jspFile);
} else {
throw new IllegalArgumentException
@@ -1590,7 +1590,7 @@
String location = errorPage.getLocation();
if ((location != null) && !location.startsWith("/")) {
if (isServlet22()) {
- log.info(sm.getString("standardContext.errorPage.warning",
+ log.debug(sm.getString("standardContext.errorPage.warning",
location));
errorPage.setLocation("/" + location);
} else {
@@ -1720,7 +1720,7 @@
if( findChild(servletName) != null) {
addServletMapping(pattern, servletName);
} else {
- log.info("Skiping " + pattern + " , no servlet " + servletName);
+ log.debug("Skiping " + pattern + " , no servlet " + servletName);
}
}
@@ -3829,7 +3829,7 @@
log=org.apache.commons.logging.LogFactory.getLog(logName);
//if (log.isDebugEnabled())
- log.info("Starting " + logName);
+ log.debug("Starting " + logName);
// Notify our interested LifecycleListeners
lifecycle.fireLifecycleEvent(BEFORE_START_EVENT, null);
@@ -3912,7 +3912,7 @@
// The setDistributable is set after the context is started, hence
// this doesn't work :(
// if ( this.getDistributable() ) {
- log.info("Creating clustering manager for context="+getName());
+ log.debug("Creating clustering manager for context="+getName());
setManager(getCluster().createManager(getName()));
// } else {
// log.info("Ignoring clustering manager for context="+getName()+ " element <distributable> not present in web.xml");
@@ -4271,7 +4271,7 @@
// Restore the original state ( pre reading web.xml in start )
// If you extend this - override this method and make sure to clean up
children=new HashMap();
- log.info("resetContext " + oname + " " + mserver);
+ log.debug("resetContext " + oname + " " + mserver);
if( oname != null ) {
Registry.getRegistry().unregisterComponent(oname);
}
@@ -4329,7 +4329,7 @@
return (urlPattern);
if (!isServlet22())
return (urlPattern);
- log.info(sm.getString("standardContext.urlPattern.patternWarning",
+ log.debug(sm.getString("standardContext.urlPattern.patternWarning",
urlPattern));
return ("/" + urlPattern);
@@ -4991,7 +4991,7 @@
ObjectName parentName=getParentName();
if( ! mserver.isRegistered(parentName)) {
- log.info("No host, creating one " + parentName);
+ log.debug("No host, creating one " + parentName);
StandardHost host=new StandardHost();
host.setName(hostName);
Registry.getRegistry().registerComponent(host, parentName, null);
@@ -5024,7 +5024,7 @@
hostName=path.substring(0, delim);
this.setName( path.substring(delim));
} else {
- log.info("Setting path " + path );
+ log.debug("Setting path " + path );
this.setName( path );
}
// XXX The service and domain should be the same.
1.16 +2 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java
Index: StandardEngine.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StandardEngine.java 22 Apr 2003 18:19:15 -0000 1.15
+++ StandardEngine.java 23 Apr 2003 16:14:09 -0000 1.16
@@ -408,7 +408,7 @@
if (domain==null) {
domain=getName();
}
- log.info( "Register " + domain );
+ log.debug( "Register " + domain );
oname=new ObjectName(domain + ":type=Engine,name="+getName());
controller=oname;
Registry.getRegistry().registerComponent(this, oname, null);
1.13 +4 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StandardHost.java 22 Apr 2003 17:11:34 -0000 1.12
+++ StandardHost.java 23 Apr 2003 16:14:09 -0000 1.13
@@ -24,7 +24,7 @@
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
- *
+ *catalina run
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
@@ -1059,7 +1059,7 @@
":type=Engine");
if( mserver.isRegistered( serviceName )) {
- log.info("Registering with the Engine");
+ log.debug("Registering with the Engine");
mserver.invoke( serviceName, "addChild",
new Object[] { this },
new String[] { "org.apache.catalina.Container" } );
@@ -1074,7 +1074,7 @@
try {
StandardEngine engine=(StandardEngine)parent;
domain=engine.getName();
- log.info( "Register " + domain );
+ log.debug( "Register " + domain );
oname=new ObjectName(domain + ":type=Host,host=" +
this.getName());
Registry.getRegistry().registerComponent(this, oname, null);
1.4 +7 -7 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/LoggerBase.java
Index: LoggerBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/LoggerBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoggerBase.java 27 Mar 2003 03:06:39 -0000 1.3
+++ LoggerBase.java 23 Apr 2003 16:14:10 -0000 1.4
@@ -274,7 +274,7 @@
* written to the log file
*/
public void log(String msg) {
- log.info(msg);
+ log.debug(msg);
}
@@ -421,7 +421,7 @@
cname=new ObjectName(domain +":j2eeType=WebModule,name=//" +
host + "/" + path);
}
- log.info("Register with " + cname);
+ log.debug("Register with " + cname);
mserver.invoke(cname, "setLogger", new Object[] {this},
new String[] {"org.apache.catalina.Logger"});
} catch (Exception e) {
@@ -536,7 +536,7 @@
ObjectName oname = createObjectName();
try {
Registry.getRegistry().registerComponent(this, oname, null);
- log.info( "registering logger " + oname );
+ log.debug( "registering logger " + oname );
} catch( Exception ex ) {
log.error( "Can't register logger " + oname, ex);
}
1.18 +5 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MBeanUtils.java 18 Apr 2003 09:49:39 -0000 1.17
+++ MBeanUtils.java 23 Apr 2003 16:14:10 -0000 1.18
@@ -264,7 +264,7 @@
ModelMBean mbean = managed.createMBean(context);
ObjectName oname = createObjectName(domain, context);
if( mserver.isRegistered(oname)) {
- log.info("Already registered " + oname);
+ log.debug("Already registered " + oname);
mserver.unregisterMBean(oname);
}
mserver.registerMBean(mbean, oname);
1.12 +7 -7 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java
Index: RealmBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RealmBase.java 8 Apr 2003 22:37:40 -0000 1.11
+++ RealmBase.java 23 Apr 2003 16:14:12 -0000 1.12
@@ -819,7 +819,7 @@
if ( oname!=null ) {
try {
Registry.getRegistry().unregisterComponent(oname);
- log.info( "unregistering realm " + oname );
+ log.debug( "unregistering realm " + oname );
} catch( Exception ex ) {
log.error( "Can't unregister realm " + oname, ex);
}
@@ -1073,7 +1073,7 @@
host + path);
}
if( mserver.isRegistered(parent )) {
- log.info("Register with " + parent);
+ log.debug("Register with " + parent);
mserver.invoke(parent, "setRealm", new Object[] {this},
new String[] {"org.apache.catalina.Realm"});
}
@@ -1088,7 +1088,7 @@
ContainerBase cb=(ContainerBase)container;
oname=new ObjectName(cb.getDomain()+":type=Realm" + cb.getContainerSuffix());
Registry.getRegistry().registerComponent(this, oname, null );
- log.info("Register Realm "+oname);
+ log.debug("Register Realm "+oname);
} catch (Throwable e) {
log.error( "Can't register " + oname, e);
}
1.17 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Index: ManagerBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ManagerBase.java 9 Apr 2003 04:28:41 -0000 1.16
+++ ManagerBase.java 23 Apr 2003 16:14:13 -0000 1.17
@@ -572,7 +572,7 @@
}
long t2=System.currentTimeMillis();
if( (t2-t1) > 100 )
- log.info(sm.getString("managerBase.seeding", randomClass) + " " + (t2-t1));
+ log.debug(sm.getString("managerBase.seeding", randomClass) + " " + (t2-t1));
}
}
}
@@ -635,7 +635,7 @@
log.error("Error registering ",e);
}
}
- log.info("Registering " + oname );
+ log.debug("Registering " + oname );
}
1.6 +3 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
Index: TldConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TldConfig.java 2 Apr 2003 20:03:11 -0000 1.5
+++ TldConfig.java 23 Apr 2003 16:14:13 -0000 1.6
@@ -167,7 +167,7 @@
public void addApplicationListener( String s ) {
//if(log.isDebugEnabled())
- log.info( "Add tld listener " + s);
+ log.debug( "Add tld listener " + s);
listeners.add(s);
}
@@ -238,7 +238,7 @@
String list[] = getTldListeners();
if( tldCache!= null ) {
- log.info( "Saving tld cache: " + tldCache + " " + list.length);
+ log.debug( "Saving tld cache: " + tldCache + " " + list.length);
try {
FileOutputStream out=new FileOutputStream(tldCache);
ObjectOutputStream oos=new ObjectOutputStream( out );
@@ -282,7 +282,7 @@
String path = (String) paths.next();
URL url = context.getServletContext().getResource(path);
if (url == null) {
- log.info( "Null url "+ path );
+ log.debug( "Null url "+ path );
break;
}
long lastM = url.openConnection().getLastModified();
1.7 +7 -7 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java
Index: ValveBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ValveBase.java 27 Mar 2003 03:06:39 -0000 1.6
+++ ValveBase.java 23 Apr 2003 16:14:13 -0000 1.7
@@ -301,7 +301,7 @@
parentName=",servlet=" + container.getName() +
",path=" + path + ",host=" + host.getName();
}
- log.info("valve parent=" + parentName + " " + parent);
+ log.debug("valve parent=" + parentName + " " + parent);
String className=this.getClass().getName();
int period = className.lastIndexOf('.');
@@ -314,7 +314,7 @@
if( valves[i]!=null &&
valves[i].getClass() == this.getClass() &&
valves[i] != this ) {
- log.info("Duplicate " + valves[i] + " " + this + " " + container);
+ log.debug("Duplicate " + valves[i] + " " + this + " " + container);
seq++;
}
}
@@ -325,7 +325,7 @@
ObjectName objectName =
new ObjectName( domain + ":type=Valve,name=" + className + ext + parentName);
- log.info("valve objectname = "+objectName);
+ log.debug("valve objectname = "+objectName);
return objectName;
}
1.4 +7 -7 jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java
Index: CoyoteConnector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoyoteConnector.java 22 Apr 2003 17:11:34 -0000 1.3
+++ CoyoteConnector.java 23 Apr 2003 16:14:13 -0000 1.4
@@ -1106,7 +1106,7 @@
} catch (Exception e) {
log.error( "Error registering connector ", e);
}
- log.info("Creating name for connector " + oname);
+ log.debug("Creating name for connector " + oname);
}
// Initializa adapter
@@ -1404,7 +1404,7 @@
ObjectName parentName=new ObjectName( domain + ":" +
"type=Service");
- log.info("Adding to " + parentName );
+ log.debug("Adding to " + parentName );
if( mserver.isRegistered(parentName )) {
mserver.invoke(parentName, "addConnector", new Object[] { this },
new String[] {"org.apache.catalina.Connector"});
@@ -1417,13 +1417,13 @@
ObjectName engName=new ObjectName( domain + ":" + "type=Engine");
if( mserver.isRegistered(engName )) {
Object obj=mserver.getAttribute(engName, "managedResource");
- log.info("Found engine " + obj + " " + obj.getClass());
+ log.debug("Found engine " + obj + " " + obj.getClass());
container=(Container)obj;
// Internal initialize - we now have the Engine
initialize();
- log.info("Initialized");
+ log.debug("Initialized");
// As a side effect we'll get the container field set
// Also initialize will be called
return;
@@ -1436,7 +1436,7 @@
public void init() throws Exception {
if( this.getService() != null ) {
- log.info( "Already configured" );
+ log.debug( "Already configured" );
return;
}
if( container==null ) {
@@ -1446,7 +1446,7 @@
public void destroy() throws Exception {
if( oname!=null && controller==oname ) {
- log.info("Unregister itself " + oname );
+ log.debug("Unregister itself " + oname );
Registry.getRegistry().unregisterComponent(oname);
}
if( getService() == null)
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org