gateway server与 connection server 集成

mpush-core/src/main/java/com/shinemo/mpush/core/AbstractServer.java

@@ -86,20 +86,20 @@ private void initServer(){
 	}
 
 	//step6 启动 netty server
-	private void startServer(){
+	public void startServer(final Server server){
 		ThreadPoolUtil.newThread(new Runnable() {
             @Override
             public void run() {
                 server.init();
                 server.start(new Server.Listener() {
                     @Override
                     public void onSuccess() {
-                        log.error("mpush app start connection server success....");
+                        log.error("mpush app start "+server.getClass().getSimpleName()+" server success....");
                     }
 
                     @Override
                     public void onFailure(String message) {
-                    	log.error("mpush app start connection server failure, jvm exit with code -1");
+                    	log.error("mpush app start "+server.getClass().getSimpleName()+" server failure, jvm exit with code -1");
                         System.exit(-1);
                     }
                 });
@@ -109,8 +109,8 @@ public void onFailure(String message) {
 	}
 
 	//step7  注册应用到zk
-	public void registerServerToZk(){
-        zkRegister.registerEphemeralSequential(application.getServerRegisterZkPath(), Jsons.toJson(application));
+	public void registerServerToZk(String path,String value){
+        zkRegister.registerEphemeralSequential(path, value);
 	}
 
 	public void start(){
@@ -119,14 +119,18 @@ public void start(){
 		registerListeners();
 		initListenerData();
 		initServer();
-		startServer();
-		registerServerToZk();
+		startServer(server);
+		registerServerToZk(application.getServerRegisterZkPath(),Jsons.toJson(application));
 	}
 
-	public void stop(){
+	public void stopServer(Server server){
 		if(server!=null){
 			server.stop(null);
 		}
 	}
 
+	public void stop(){
+		stopServer(server);
+	}
+
 }

mpush-cs/src/main/java/com/shinemo/mpush/cs/ConnectionServerApplication.java

@@ -7,6 +7,7 @@
 
 public class ConnectionServerApplication extends Application{
 
+	private transient GatewayServerApplication gatewayServerApplication;
 
 	public ConnectionServerApplication() {
 		this(ConfigCenter.holder.connectionServerPort(),ZKPath.CONNECTION_SERVER.getWatchPath(),MPushUtil.getLocalIp());
@@ -18,4 +19,12 @@ public ConnectionServerApplication(int port,String path,String ip) {
 		setIp(ip);
 	}
 
+	public GatewayServerApplication getGatewayServerApplication() {
+		return gatewayServerApplication;
+	}
+
+	public void setGatewayServerApplication(GatewayServerApplication gatewayServerApplication) {
+		this.gatewayServerApplication = gatewayServerApplication;
+	}
+
 }

mpush-cs/src/main/java/com/shinemo/mpush/cs/ConnectionServerMain.java

@@ -5,37 +5,50 @@
 import com.shinemo.mpush.api.Server;
 import com.shinemo.mpush.core.AbstractServer;
 import com.shinemo.mpush.core.server.ConnectionServer;
+import com.shinemo.mpush.core.server.GatewayServer;
 import com.shinemo.mpush.cs.zk.listener.impl.ConnectionServerPathListener;
-import com.shinemo.mpush.cs.zk.listener.impl.PushServerPathListener;
-import com.shinemo.mpush.tools.config.ConfigCenter;
-import com.shinemo.mpush.tools.zk.listener.impl.RedisPathListener;
+import com.shinemo.mpush.cs.zk.listener.impl.GatewayServerPathListener;
+import com.shinemo.mpush.tools.Jsons;
 
 public class ConnectionServerMain extends AbstractServer<ConnectionServerApplication>{
 
+	private Server gatewayServer;
+
+	private ConnectionServerApplication  connectionServerApplication;
+
+	private GatewayServerApplication gatewayServerApplication;
+
 	public ConnectionServerMain(){
 
-		registerListener(new RedisPathListener());
-		registerListener(new PushServerPathListener());
 		registerListener(new ConnectionServerPathListener());
+		registerListener(new GatewayServerPathListener());
 
+		connectionServerApplication = (ConnectionServerApplication)application;
+		gatewayServerApplication =  new GatewayServerApplication();
+		connectionServerApplication.setGatewayServerApplication(gatewayServerApplication);
+		gatewayServer = new GatewayServer(gatewayServerApplication.getPort());
+	}
+
+	@Override
+	public void start() {
+		super.start();
+		startServer(gatewayServer);
+		registerServerToZk(gatewayServerApplication.getServerRegisterZkPath(), Jsons.toJson(gatewayServerApplication));
 	}
+
 
 	@Override
 	public Server getServer() {
-		final int port = ConfigCenter.holder.connectionServerPort();
+		final int port = application.getPort();
         ConnectionServer connectionServer = new ConnectionServer(port);
         return connectionServer;
 	}
-
 
-	public static void main(String[] args) {
-		final ConnectionServerMain connectionServerMain = new ConnectionServerMain();
-		connectionServerMain.start();
-		Runtime.getRuntime().addShutdownHook(new Thread() {
-            public void run() {
-            	connectionServerMain.stop();
-            }
-        });
+	@Override
+	public void stop() {
+		super.stop();
+		stopServer(gatewayServer);
 	}
+
 
 }

mpush-cs/src/main/java/com/shinemo/mpush/cs/GatewayServerApplication.java

@@ -1,16 +1,20 @@
 package com.shinemo.mpush.cs;
 
-import com.shinemo.mpush.common.Application;
 import com.shinemo.mpush.tools.MPushUtil;
 import com.shinemo.mpush.tools.config.ConfigCenter;
 import com.shinemo.mpush.tools.zk.ZKPath;
 
-public class GatewayServerApplication extends Application{
-
+
+public class GatewayServerApplication extends ConnectionServerApplication{
+
 	public GatewayServerApplication() {
-		setPort(ConfigCenter.holder.gatewayServerPort());
-		setServerRegisterZkPath(ZKPath.GATEWAY_SERVER.getWatchPath());
-		setIp(MPushUtil.getLocalIp());
+		this(ConfigCenter.holder.gatewayServerPort(),ZKPath.GATEWAY_SERVER.getWatchPath(),MPushUtil.getLocalIp());
 	}
-
+
+	public GatewayServerApplication(int port,String path,String ip) {
+		setPort(port);
+		setServerRegisterZkPath(path);
+		setIp(ip);
+	}
+
 }

mpush-cs/src/main/java/com/shinemo/mpush/cs/Main.java

@@ -0,0 +1,15 @@
+package com.shinemo.mpush.cs;
+
+public class Main {
+
+	public static void main(String[] args) {
+		final ConnectionServerMain connectionServerMain = new ConnectionServerMain();
+		connectionServerMain.start();
+		Runtime.getRuntime().addShutdownHook(new Thread() {
+            public void run() {
+            	connectionServerMain.stop();
+            }
+        });
+	}
+
+}