Skip to content

Commit

Permalink
[collector] Add handler access contoroller. #588
Browse files Browse the repository at this point in the history
create DispatchHandlerWrapper.
  • Loading branch information
koo-taejin committed Jun 16, 2015
1 parent 0d42bab commit 50cb5a1
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 29 deletions.
Expand Up @@ -23,18 +23,18 @@
*/
public final class ControllerUtils {

public static final ModelAndView createJsonView() {
public static ModelAndView createJsonView() {
ModelAndView mv = new ModelAndView();
mv.setViewName("jsonView");

return mv;
}

public static final ModelAndView createJsonView(boolean success) {
public static ModelAndView createJsonView(boolean success) {
return createJsonView(success, null);
}

public static final ModelAndView createJsonView(boolean success, Object message) {
public static ModelAndView createJsonView(boolean success, Object message) {
ModelAndView mv = createJsonView();

if (success) {
Expand Down
Expand Up @@ -24,9 +24,7 @@
import com.navercorp.pinpoint.collector.handler.Handler;
import com.navercorp.pinpoint.collector.handler.RequestResponseHandler;
import com.navercorp.pinpoint.collector.handler.SimpleHandler;
import com.navercorp.pinpoint.collector.manage.HandlerManager;
import com.navercorp.pinpoint.collector.util.AcceptedTimeService;
import com.navercorp.pinpoint.thrift.dto.TResult;

/**
* @author emeroad
Expand All @@ -39,9 +37,6 @@ public abstract class AbstractDispatchHandler implements DispatchHandler {
@Autowired
private AcceptedTimeService acceptedTimeService;

@Autowired
private HandlerManager handlerManager;

public AbstractDispatchHandler() {
}

Expand All @@ -52,11 +47,6 @@ public void dispatchSendMessage(TBase<?, ?> tBase) {
// mark accepted time
acceptedTimeService.accept();

if (!handlerManager.isEnable()) {
logger.debug("Handler is disabled. Skipping send message {}.", tBase);
return;
}

// TODO consider to change dispatch table automatically
SimpleHandler simpleHandler = getSimpleHandler(tBase);
if (simpleHandler != null) {
Expand All @@ -83,13 +73,6 @@ public TBase dispatchRequestMessage(TBase<?,?> tBase) {
// mark accepted time
acceptedTimeService.accept();

if (!handlerManager.isEnable()) {
logger.debug("Handler is disabled. Skipping request message {}.", tBase);
TResult result = new TResult(false);
result.setMessage("Handler is disabled. Skipping request message.");
return result;
}

RequestResponseHandler requestResponseHandler = getRequestResponseHandler(tBase);
if (requestResponseHandler != null) {
if (logger.isTraceEnabled()) {
Expand Down
@@ -0,0 +1,81 @@
/*
* Copyright 2014 NAVER Corp.
*
* Licensed 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 com.navercorp.pinpoint.collector.receiver;

import org.apache.thrift.TBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

import com.navercorp.pinpoint.collector.manage.HandlerManager;
import com.navercorp.pinpoint.thrift.dto.TResult;

/**
* @author Taejin Koo
*/
public class DispatchHandlerWrapper implements DispatchHandler {

private final Logger logger = LoggerFactory.getLogger(this.getClass());

private final DispatchHandler delegate;

@Autowired
private HandlerManager handlerManager;

public DispatchHandlerWrapper(DispatchHandler dispatchHandler) {
if (dispatchHandler == null) {
throw new NullPointerException("dispatchHandler may note be null.");
}
this.delegate = dispatchHandler;
}

@Override
public void dispatchSendMessage(TBase<?, ?> tBase) {
if (checkAvaiable()) {
this.delegate.dispatchSendMessage(tBase);
}

logger.debug("Handler is disabled. Skipping send message {}.", tBase);
return;
}

@Override
public TBase dispatchRequestMessage(TBase<?, ?> tBase) {
if (checkAvaiable()) {
return this.delegate.dispatchRequestMessage(tBase);
}

logger.debug("Handler is disabled. Skipping request message {}.", tBase);

TResult result = new TResult(false);
result.setMessage("Handler is disabled. Skipping request message.");
return result;
}

private boolean checkAvaiable() {
if (handlerManager == null) {
return true;
}

if (handlerManager.isEnable()) {
return true;
}

return false;
}

}
26 changes: 17 additions & 9 deletions collector/src/main/resources/applicationContext-collector.xml
Expand Up @@ -43,11 +43,6 @@

<import resource="classpath:applicationContext-hbase.xml"/>

<bean id="tcpDispatchHandler" class="com.navercorp.pinpoint.collector.receiver.TcpDispatchHandler"/>
<bean id="udpDispatchHandler" class="com.navercorp.pinpoint.collector.receiver.UdpDispatchHandler"/>
<bean id="udpSpanDispatchHandler" class="com.navercorp.pinpoint.collector.receiver.UdpSpanDispatchHandler"/>


<bean id="daoAutoFlusher" class="com.navercorp.pinpoint.collector.dao.AutoFlusher" init-method="initialize" destroy-method="shutdown">
<beans:property name="cachedStatisticsDaoList">
<beans:list>
Expand All @@ -74,9 +69,22 @@

<bean id="handlerManager" class="com.navercorp.pinpoint.collector.manage.HandlerManager">
</bean>

<!-- DispatchHandler-related Beans -->
<bean id="tcpDispatchHandler" class="com.navercorp.pinpoint.collector.receiver.TcpDispatchHandler"/>
<bean id="tcpDispatchHandlerWrapper" class="com.navercorp.pinpoint.collector.receiver.DispatchHandlerWrapper">
<constructor-arg ref="tcpDispatchHandler"/>
</bean>


<bean id="udpDispatchHandler" class="com.navercorp.pinpoint.collector.receiver.UdpDispatchHandler"/>
<bean id="udpDispatchHandlerWrapper" class="com.navercorp.pinpoint.collector.receiver.DispatchHandlerWrapper">
<constructor-arg ref="udpDispatchHandler"/>
</bean>

<bean id="udpSpanDispatchHandler" class="com.navercorp.pinpoint.collector.receiver.UdpSpanDispatchHandler"/>
<bean id="udpSpanDispatchHandlerWrapper" class="com.navercorp.pinpoint.collector.receiver.DispatchHandlerWrapper">
<constructor-arg ref="udpSpanDispatchHandler"/>
</bean>

<!-- Cluster-related Beans -->
<bean id="commandHeaderTBaseSerializerFactory" class="com.navercorp.pinpoint.thrift.io.CommandHeaderTBaseSerializerFactory">
Expand All @@ -101,15 +109,15 @@
</util:list>

<bean id="tcpReceiver" class="com.navercorp.pinpoint.collector.receiver.tcp.TCPReceiver">
<constructor-arg type="com.navercorp.pinpoint.collector.receiver.DispatchHandler" ref="tcpDispatchHandler"/>
<constructor-arg type="com.navercorp.pinpoint.collector.receiver.DispatchHandler" ref="tcpDispatchHandlerWrapper"/>
<constructor-arg type="com.navercorp.pinpoint.collector.config.CollectorConfiguration" ref="collectorConfiguration"/>
<constructor-arg type="com.navercorp.pinpoint.rpc.server.PinpointServerAcceptor" ref="serverAcceptor"/>
<constructor-arg type="com.navercorp.pinpoint.collector.cluster.zookeeper.ZookeeperClusterService" ref="clusterService"/>
</bean>

<!-- UDPSpanReceiver related Beans -->
<bean id="udpSpanBasePacketHandler" class="com.navercorp.pinpoint.collector.receiver.udp.BaseUDPHandlerFactory">
<constructor-arg index="0" ref="udpSpanDispatchHandler"/>
<constructor-arg index="0" ref="udpSpanDispatchHandlerWrapper"/>
<constructor-arg index="1" ref="tBaseFilterChain"/>
</bean>

Expand Down Expand Up @@ -140,7 +148,7 @@

<!-- UDPStatReceiver related Beans -->
<bean id="udpStatBasePacketHandler" class="com.navercorp.pinpoint.collector.receiver.udp.BaseUDPHandlerFactory">
<constructor-arg index="0" ref="udpDispatchHandler"/>
<constructor-arg index="0" ref="udpDispatchHandlerWrapper"/>
<constructor-arg index="1" ref="tBaseFilterChain"/>
</bean>

Expand Down

0 comments on commit 50cb5a1

Please sign in to comment.