Author: kfujino Date: Wed Apr 19 07:49:11 2017 New Revision: 1791867 URL: http://svn.apache.org/viewvc?rev=1791867&view=rev Log: Add JMX support for Channel Interceptors. Add MBean for TcpFailureDetector.
Added: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetectorMBean.java (with props) Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1791867&r1=1791866&r2=1791867&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java Wed Apr 19 07:49:11 2017 @@ -16,11 +16,14 @@ */ package org.apache.catalina.tribes.group; +import javax.management.ObjectName; + import org.apache.catalina.tribes.Channel; import org.apache.catalina.tribes.ChannelException; import org.apache.catalina.tribes.ChannelInterceptor; import org.apache.catalina.tribes.ChannelMessage; import org.apache.catalina.tribes.Member; +import org.apache.catalina.tribes.jmx.JmxRegistry; /** * Abstract class for the interceptor base class. @@ -33,6 +36,11 @@ public abstract class ChannelInterceptor //default value, always process protected int optionFlag = 0; + /** + * the ObjectName of this ChannelInterceptor. + */ + private ObjectName oname = null; + public ChannelInterceptorBase() { } @@ -155,6 +163,10 @@ public abstract class ChannelInterceptor @Override public void start(int svc) throws ChannelException { if ( getNext()!=null ) getNext().start(svc); + // register jmx + JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel); + if (jmxRegistry != null) this.oname = jmxRegistry.registerJmx( + ",component=Interceptor,interceptorName=" + getClass().getSimpleName(), this); } /** @@ -171,6 +183,10 @@ public abstract class ChannelInterceptor @Override public void stop(int svc) throws ChannelException { if (getNext() != null) getNext().stop(svc); + if (oname != null) { + JmxRegistry.getRegistry(channel).unregisterJmx(oname); + oname = null; + } channel = null; } Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=1791867&r1=1791866&r2=1791867&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java Wed Apr 19 07:49:11 2017 @@ -59,7 +59,7 @@ import org.apache.juli.logging.LogFactor * * @version 1.0 */ -public class TcpFailureDetector extends ChannelInterceptorBase { +public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFailureDetectorMBean { private static final Log log = LogFactory.getLog(TcpFailureDetector.class); protected static final StringManager sm = StringManager.getManager(TcpFailureDetector.class); Added: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetectorMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetectorMBean.java?rev=1791867&view=auto ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetectorMBean.java (added) +++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetectorMBean.java Wed Apr 19 07:49:11 2017 @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.catalina.tribes.group.interceptors; + +public interface TcpFailureDetectorMBean { + + public int getOptionFlag(); + + // Attributes + public long getConnectTimeout(); + + public boolean getPerformSendTest(); + + public boolean getPerformReadTest(); + + public long getReadTestTimeout(); + + public int getRemoveSuspectsTimeout(); + + public void setPerformReadTest(boolean performReadTest); + + public void setPerformSendTest(boolean performSendTest); + + public void setReadTestTimeout(long readTestTimeout); + + public void setConnectTimeout(long connectTimeout); + + public void setRemoveSuspectsTimeout(int removeSuspectsTimeout); + + // Operations + public void checkMembers(boolean checkAll); +} \ No newline at end of file Propchange: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetectorMBean.java ------------------------------------------------------------------------------ svn:eol-style = native --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org