pero 2005/01/29 11:31:50 Modified: jk/java/org/apache/jk/common JkMX.java Log: make log4j mbean configureable with attribute log4jEnabled Revision Changes Path 1.26 +31 -14 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java Index: JkMX.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- JkMX.java 3 Sep 2004 04:28:39 -0000 1.25 +++ JkMX.java 29 Jan 2005 19:31:50 -0000 1.26 @@ -44,6 +44,7 @@ { MBeanServer mserver; private boolean enabled=false; + private boolean log4jEnabled=true; private int httpport=-1; private String httphost="localhost"; private String authmode="none"; @@ -68,6 +69,16 @@ return enabled; } + /** Enable the Log4j MBean) + */ + public void setLog4jEnabled(boolean b) { + log4jEnabled=b; + } + + public boolean getLog4jEnabled() { + return log4jEnabled; + } + /** Enable the MX4J adapters (old way, compatible) */ public void setPort(int i) { @@ -223,8 +234,8 @@ } // starts the server mserver.invoke(httpServerName, "start", null, null); - - log.info( "Started MX4J console on host " + httphost + " at port " + httpport); + if(log.isInfoEnabled()) + log.info( "Started MX4J console on host " + httphost + " at port " + httpport); httpAdapterLoaded = true; @@ -241,7 +252,8 @@ mserver.setAttribute(jrmpServerName, new Attribute("Port", new Integer(jrmpport))); mserver.invoke(jrmpServerName, "start", null, null); - log.info( "Creating " + jrmpServerName ); + if(log.isInfoEnabled()) + log.info( "Creating " + jrmpServerName ); // Create the JRMP adaptor ObjectName adaptor = registerObject("mx4j.adaptor.rmi.jrmp.JRMPAdaptor", @@ -266,7 +278,8 @@ // Registers the JRMP adaptor in JNDI and starts it mserver.invoke(adaptor, "start", null, null); - log.info( "Creating " + adaptor + " on host " + jrmphost + " at port " + jrmpport); + if(log.isInfoEnabled()) + log.info( "Creating " + adaptor + " on host " + jrmphost + " at port " + jrmpport); jrmpAdapterLoaded = true; @@ -280,7 +293,8 @@ try { httpServerName=registerObject("com.sun.jdmk.comm.HtmlAdaptorServer", "Adaptor:name=html,port=" + httpport); - log.info("Registering the JMX_RI html adapter " + httpServerName + " at port " + httpport); + if(log.isInfoEnabled()) + log.info("Registering the JMX_RI html adapter " + httpServerName + " at port " + httpport); mserver.setAttribute(httpServerName, new Attribute("Port", new Integer(httpport))); @@ -301,7 +315,8 @@ public void destroy() { try { - log.info("Stoping JMX "); + if(log.isInfoEnabled()) + log.info("Stoping JMX "); if( httpServerName!=null ) { mserver.invoke(httpServerName, "stop", null, null); @@ -321,15 +336,17 @@ if( enabled ) { loadAdapter(); } - - try { - registerObject("org.apache.log4j.jmx.HierarchyDynamicMBean" , - "log4j:hierarchy=default"); - log.info("Registering the JMX hierarchy for Log4J "); - } catch( Throwable t ) { - log.info("Can't enable log4j mx: " + t.toString()); + if( log4jEnabled) { + try { + registerObject("org.apache.log4j.jmx.HierarchyDynamicMBean" , + "log4j:hierarchy=default"); + if(log.isInfoEnabled()) + log.info("Registering the JMX hierarchy for Log4J "); + } catch( Throwable t ) { + if(log.isInfoEnabled()) + log.info("Can't enable log4j mx: ",t); + } } - } catch( Throwable t ) { log.error( "Init error", t ); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]