app data

cat-broker/src/main/java/com/dianping/cat/broker/api/app/BucketHandler.java

@@ -12,7 +12,9 @@ import java.util.Map.Entry;
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.unidal.helper.Threads.Task;
+import org.unidal.lookup.annotation.Inject;
 
+import com.dianping.cat.config.app.AppDataService;
 import com.dianping.cat.service.appData.entity.AppData;
 
 public class BucketHandler implements Task, LogEnabled {
@@ -23,6 +25,9 @@ public class BucketHandler implements Task, LogEnabled {
 
 	private HashMap<Integer, HashMap<String, AppData>> m_mergedData;
 	
+	@Inject
+	private AppDataService m_appDataService;
+
 	private long m_startTime;
 
 	private boolean m_isActive = true;
@@ -99,7 +104,7 @@ public class BucketHandler implements Task, LogEnabled {
 			for (Entry<String, AppData> entry : outerEntry.getValue().entrySet()) {
 				AppData appData = entry.getValue();
 
-				if (toHbase(appData) == false) {
+				if (saveToDataBase(appData) == false) {
 					saveToFile(appData);
 				}
 			}
@@ -121,8 +126,9 @@ public class BucketHandler implements Task, LogEnabled {
 		m_appDataQueue.offer(appData);
 	}
 
-	private boolean toHbase(AppData appData) {
-		return false;
+	private boolean saveToDataBase(AppData appData) {
+		m_appDataService.insert();
+		return true;
 	}
 
 	private void saveToFile(AppData appData) {

cat-broker/src/main/java/com/dianping/cat/broker/api/page/batch/Handler.java

@@ -22,6 +22,7 @@ import com.dianping.cat.broker.api.page.IpService.IpInfo;
 import com.dianping.cat.broker.api.page.MonitorEntity;
 import com.dianping.cat.broker.api.page.MonitorManager;
 import com.dianping.cat.broker.api.page.RequestUtils;
+import com.dianping.cat.config.app.AppConfigManager;
 import com.dianping.cat.service.appData.entity.AppData;
 
 public class Handler implements PageHandler<Context>, LogEnabled {
@@ -32,6 +33,9 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 	@Inject
 	private IpService m_ipService;
 	
+	@Inject
+	private AppConfigManager m_appConfigManager;
+
 	private Logger m_logger;
 
 	@Inject
@@ -129,10 +133,14 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 
 				try {
 					appData.setTimestamp(Long.parseLong(items[0]));
-					appData.setNetwork(Integer.parseInt(items[1]));
-					appData.setVersion(Integer.parseInt(items[2]));
-					appData.setChannel(Integer.parseInt(items[3]));
-					appData.setCommand(Integer.parseInt(items[4]));
+					Integer command = m_appConfigManager.getCommands().get(items[2]);
+					if (command == null) {
+						continue;
+					}
+					appData.setCommand(command);
+					appData.setNetwork(Integer.parseInt(items[2]));
+					appData.setVersion(Integer.parseInt(items[3]));
+					appData.setChannel(Integer.parseInt(items[4]));
 					appData.setCode(Integer.parseInt(items[5]));
 					appData.setPlatform(Integer.parseInt(items[6]));
 					appData.setRequestByte(Integer.parseInt(items[7]));

pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.dianping.cat</groupId>
 	<artifactId>parent</artifactId>
@@ -17,6 +16,7 @@
 		<module>cat-home</module>
 		<module>cat-broker</module>
 		<module>cat-agent</module>
+    <module>IPService</module>
   </modules>
 	<dependencyManagement>
 		<dependencies>