open appList 接口

mpusher · Dec 31, 2015 · 8baa691 · 8baa691
1 parent 5f192fa
commit 8baa691
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/...-tools/src/main/java/com/shinemo/mpush/tools/zk/listener/impl/ConnectionPathListener.java b/...-tools/src/main/java/com/shinemo/mpush/tools/zk/listener/impl/ConnectionPathListener.java
@@ -40,13 +40,10 @@ public void handler(CuratorFramework client, TreeCacheEvent event, String path)
 		}
 		if (Type.NODE_ADDED == event.getType()) {
 			dataAddOrUpdate(event.getData());
-			log.warn("ConnectionPathListener path:" + path + ", node Add"+","+data);
 		} else if (Type.NODE_REMOVED == event.getType()) {
 			dataRemove(event.getData());
-			log.warn("ConnectionPathListener path:" + path + ", node Remove"+","+data);
 		} else if (Type.NODE_UPDATED == event.getType()) {
 			dataAddOrUpdate(event.getData());
-			log.warn("ConnectionPathListener path:" + path + "," + "node update"+","+data);
 		} else {
 			log.warn("ConnectionPathListener other path:" + path + "," + event.getType().name()+","+data);
 		}
@@ -55,12 +52,12 @@ public void handler(CuratorFramework client, TreeCacheEvent event, String path)
 	@Override
 	public void initData(ServerManage manage) {
 		log.warn("start init app data");
-		getData();
+		_initData();
 		printAppList();
 		log.warn("end init app data");
 	}
 
-	private void getData(){
+	private void _initData(){
 		//获取机器列表
 		List<String> rawData = ZkUtil.instance.getChildrenKeys(PathEnum.CONNECTION_SERVER_ALL_HOST.getPath());
 		for(String raw:rawData){
@@ -90,13 +87,13 @@ private ServerApp getServerApp(String fullPath){
 		return app;
 	}
 
-	public Collection<ServerApp> getAppList(){
-		return Collections.unmodifiableCollection(holder.values());
-	}
-
 	private void printAppList(){
 		for(ServerApp app:holder.values()){
 			log.warn(ToStringBuilder.reflectionToString(app, ToStringStyle.DEFAULT_STYLE));
 		}
 	}
+
+	public Collection<ServerApp> getAppList() {
+		return Collections.unmodifiableCollection(holder.values());
+	}
 }
diff --git a/mpush-tools/src/main/java/com/shinemo/mpush/tools/zk/manage/ServerManage.java b/mpush-tools/src/main/java/com/shinemo/mpush/tools/zk/manage/ServerManage.java
@@ -1,5 +1,6 @@
 package com.shinemo.mpush.tools.zk.manage;
 
+import java.util.Collection;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.curator.framework.CuratorFramework;
@@ -11,12 +12,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.shinemo.mpush.tools.InetAddressUtil;
 import com.shinemo.mpush.tools.Jsons;
 import com.shinemo.mpush.tools.zk.PathEnum;
 import com.shinemo.mpush.tools.zk.ServerApp;
 import com.shinemo.mpush.tools.zk.ZkUtil;
 import com.shinemo.mpush.tools.zk.listener.CallBack;
 import com.shinemo.mpush.tools.zk.listener.ListenerDispatcher;
+import com.shinemo.mpush.tools.zk.listener.impl.ConnectionPathListener;
 
 public class ServerManage {
 
@@ -118,5 +121,11 @@ public ZkUtil getZkUtil(){
     public ListenerDispatcher getDispatcher(){
     	return dispatcher;
     }
+
+    public Collection<ServerApp> getServerApp(){
+    	CallBack callback = dispatcher.getListener(PathEnum.CONNECTION_SERVER_ALL_HOST, InetAddressUtil.getInetAddress());
+    	ConnectionPathListener listener =  (ConnectionPathListener)callback;
+    	return listener.getAppList();
+    }
 
 }