提交 76d303c0 编写于 作者: K kezhu.wu

commit my code

上级 fbbfddec
......@@ -6,6 +6,11 @@ import java.util.Map;
import org.unidal.socket.Message;
public class ProtocolMessage implements Message {
public static final String HELLO_NAME = "hello";
public static final String HEARTBEAT_NAME = "heartbeat";
private String m_name;
private String m_content;
......
......@@ -316,8 +316,8 @@
<implementation>com.dianping.cat.abtest.spi.internal.DefaultABTestEntityManager</implementation>
</component>
<component>
<role>com.dianping.cat.abtest.spi.internal.ABTestEntityRepository</role>
<implementation>com.dianping.cat.abtest.spi.internal.DefaultABTestEntityRepository</implementation>
<role>com.dianping.cat.abtest.repository.ABTestEntityRepository</role>
<implementation>com.dianping.cat.abtest.repository.DefaultABTestEntityRepository</implementation>
<configuration>
<address>228.0.0.3:2283</address>
</configuration>
......@@ -325,10 +325,6 @@
<requirement>
<role>com.dianping.cat.configuration.ClientConfigManager</role>
</requirement>
<requirement>
<role>org.unidal.socket.udp.UdpSocket</role>
<role-hint>abtest</role-hint>
</requirement>
</requirements>
</component>
</components>
......
......@@ -10,6 +10,11 @@
<name>CAT Home</name>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>org.unidal.framework</groupId>
<artifactId>foundation-service</artifactId>
<version>2.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.dianping.cat</groupId>
<artifactId>cat-consumer</artifactId>
......
......@@ -21,14 +21,13 @@ import com.dianping.cat.system.alarm.threshold.listener.ServiceDataListener;
import com.dianping.cat.system.alarm.threshold.listener.ThresholdAlertListener;
import com.dianping.cat.system.event.EventListenerRegistry;
import com.dianping.cat.system.notify.ScheduledMailTask;
import com.dianping.cat.system.page.abtest.server.ABTestEntityServer;
public class CatHomeModule extends AbstractModule {
public static final String ID = "cat-home";
@Override
protected void execute(ModuleContext ctx) throws Exception {
// warm up IP seeker
// IPSeekerManager.initailize(new File(serverConfigManager.getStorageLocalBaseDir()));
ServerConfigManager serverConfigManager = ctx.lookup(ServerConfigManager.class);
ctx.lookup(MessageConsumer.class, "realtime");
......@@ -42,10 +41,18 @@ public class CatHomeModule extends AbstractModule {
Threads.forGroup("Cat").start(dailyTaskProducer);
}
executeAlarmModule(ctx);
executeAbtestModule(ctx);
executeAlarmModule(ctx);
}
private void executeAlarmModule(ModuleContext ctx) throws Exception {
private void executeAbtestModule(ModuleContext ctx) {
ABTestEntityServer server = ctx.lookup(ABTestEntityServer.class);
server.start();
}
private void executeAlarmModule(ModuleContext ctx) throws Exception {
ServerConfigManager serverConfigManager = ctx.lookup(ServerConfigManager.class);
EventListenerRegistry registry = ctx.lookup(EventListenerRegistry.class);
......
......@@ -8,6 +8,9 @@ import org.unidal.lookup.configuration.Component;
import com.dianping.cat.configuration.ServerConfigManager;
import com.dianping.cat.hadoop.hdfs.HdfsMessageBucketManager;
import com.dianping.cat.home.dal.abtest.AbtestDao;
import com.dianping.cat.home.dal.abtest.AbtestRunDao;
import com.dianping.cat.home.dal.abtest.GroupStrategyDao;
import com.dianping.cat.message.spi.MessageCodec;
import com.dianping.cat.message.spi.MessageConsumer;
import com.dianping.cat.report.page.model.cross.CompositeCrossService;
......@@ -51,6 +54,8 @@ import com.dianping.cat.report.service.ReportService;
import com.dianping.cat.storage.BucketManager;
import com.dianping.cat.storage.dump.LocalMessageBucketManager;
import com.dianping.cat.storage.dump.MessageBucketManager;
import com.dianping.cat.system.page.abtest.server.ABTestEntityServer;
import com.dianping.cat.system.page.abtest.server.DefaultABTestEntityServer;
class ServiceComponentConfigurator extends AbstractResourceConfigurator {
@Override
......@@ -169,6 +174,11 @@ class ServiceComponentConfigurator extends AbstractResourceConfigurator {
.req(ServerConfigManager.class) //
.req(ModelService.class, new String[] { "message-historical", "logview-historical" }, "m_services"));
all.add(C(ABTestEntityServer.class, DefaultABTestEntityServer.class) //
.req(AbtestRunDao.class) //
.req(AbtestDao.class) //
.req(GroupStrategyDao.class));
return all;
}
}
......@@ -72,13 +72,24 @@ public class DefaultABTestEntityServer implements ABTestEntityServer, Initializa
private AbtestModel m_abtestModel;
public DefaultABTestEntityServer() {
super();
System.out.println("ABTest Server initing.");
}
@Override
public void initialize() throws InitializationException {
m_logger.info("ABTest Server initing.");
m_socket = new UdpSocket();
m_socket.setName("ABTest");
m_socket.setCodec(new ProtocolMessageCodec());
m_socket.onMessage(new ProtocolHandler());
m_logger.info("ABTest Server inited");
}
public void start() {
m_socket.listenOn(m_address);
// 启动RefreshEntityTask任务
......
......@@ -1141,6 +1141,21 @@
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.system.page.abtest.server.ABTestEntityServer</role>
<implementation>com.dianping.cat.system.page.abtest.server.DefaultABTestEntityServer</implementation>
<requirements>
<requirement>
<role>com.dianping.cat.home.dal.abtest.AbtestRunDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.abtest.AbtestDao</role>
</requirement>
<requirement>
<role>com.dianping.cat.home.dal.abtest.GroupStrategyDao</role>
</requirement>
</requirements>
</component>
<component>
<role>org.unidal.dal.jdbc.datasource.JdbcDataSourceConfigurationManager</role>
<implementation>org.unidal.dal.jdbc.datasource.JdbcDataSourceConfigurationManager</implementation>
......
......@@ -3,9 +3,9 @@
<jdbc package="com.dianping.cat.home.dal" name="cat">
<datasource>
<driver>com.mysql.jdbc.Driver</driver>
<url>jdbc:mysql://127.0.0.1:3306/cat</url>
<user>root</user>
<password></password>
<url>jdbc:mysql://192.168.7.43:3306/cat</url>
<user>binlog</user>
<password>binlog</password>
<properties>useUnicode=true&amp;autoReconnect=true</properties>
</datasource>
<group name="report" package="com.dianping.cat.home.dal.report">
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册