重构

debug.sh → bin/debug.sh

@@ -1,14 +1,15 @@
 #!/bin/sh
 
-ENV=dev
-base_dir=`pwd`
+ENV=daily
+cd `dirname $0`
+cd ..
 
 echo "start package project..."
 mvn clean
 mvn package -P $ENV
 
 echo "start tar mpush..."
-cd $base_dir/mpush-boot/target
+cd ./mpush-boot/target
 tar -xzvf ./mpush-release.tar.gz
 
 echo "start start mpush..."

bin/run.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+ENV=dev
+
+cd `dirname $0`
+cd ..
+
+echo "start tar mpush..."
+cd ./mpush-boot/target
+
+rm -rf mpush
+tar -xzvf ./mpush-release.tar.gz
+
+echo "start start mpush..."
+
+cd mpush
+java \
+-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7998 \
+-Dio.netty.leakDetectionLevel=advanced \
+-jar boot.jar

bin/start.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+ENV=dev
+
+cd `dirname $0`
+cd ..
+
+echo "start package project..."
+mvn clean
+mvn package -P $ENV
+
+echo "start tar mpush..."
+cd ./mpush-boot/target
+tar -xzvf ./mpush-release.tar.gz
+
+echo "start start mpush..."
+cd mpush
+nohup java \
+-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7998 \
+-Dio.netty.leakDetectionLevel=advanced \
+-jar boot.jar >/dev/null 2>&1 &
+
+echo "end start mpush..."

mpush-api/src/main/java/com/mpush/api/Constants.java

@@ -4,6 +4,8 @@
 
 /**
  * Created by ohun on 2015/12/23.
+ *
+ * @author ohun@live.cn
  */
 public interface Constants {
     Charset UTF_8 = Charset.forName("UTF-8");

mpush-api/src/main/java/com/mpush/api/Message.java

@@ -1,11 +1,13 @@
 package com.mpush.api;
 
-import com.mpush.api.protocol.Packet;
 import com.mpush.api.connection.Connection;
+import com.mpush.api.protocol.Packet;
 import io.netty.channel.ChannelFutureListener;
 
 /**
  * Created by ohun on 2015/12/22.
+ *
+ * @author ohun@live.cn
  */
 public interface Message {
 

mpush-api/src/main/java/com/mpush/api/MessageHandler.java

@@ -5,6 +5,8 @@
 
 /**
  * Created by ohun on 2015/12/22.
+ *
+ * @author ohun@live.cn
  */
 public interface MessageHandler {
     void handle(Packet packet, Connection connection);

mpush-api/src/main/java/com/mpush/api/PacketReceiver.java

@@ -5,6 +5,8 @@
 
 /**
  * Created by ohun on 2015/12/22.
+ *
+ * @author ohun@live.cn
  */
 public interface PacketReceiver {
     void onReceive(Packet packet, Connection connection);

mpush-api/src/main/java/com/mpush/api/PushSender.java

@@ -4,6 +4,8 @@
 
 /**
  * Created by ohun on 2015/12/30.
+ *
+ * @author ohun@live.cn
  */
 public interface PushSender {
     void send(String content, Collection<String> userIds, Callback callback);

mpush-api/src/main/java/com/mpush/api/Server.java

@@ -2,6 +2,8 @@
 
 /**
  * Created by ohun on 2015/12/24.
+ *
+ * @author ohun@live.cn
  */
 public interface Server {
 
@@ -14,8 +16,8 @@ public interface Server {
     boolean isRunning();
 
     interface Listener {
-        void onSuccess();
+        void onSuccess(int port);
 
-        void onFailure(String message);
+        void onFailure(Throwable cause);
     }
 }

mpush-api/src/main/java/com/mpush/api/connection/Cipher.java

@@ -2,6 +2,8 @@
 
 /**
  * Created by ohun on 2015/12/28.
+ *
+ * @author ohun@live.cn
  */
 public interface Cipher {
 

mpush-api/src/main/java/com/mpush/api/connection/SessionContext.java

@@ -2,6 +2,8 @@
 
 /**
  * Created by ohun on 2015/12/22.
+ *
+ * @author ohun@live.cn
  */
 public final class SessionContext {
     public String osName;

mpush-api/src/main/java/com/mpush/api/event/Event.java

@@ -2,6 +2,8 @@
 
 /**
  * Created by ohun on 2015/12/29.
+ *
+ * @author ohun@live.cn
  */
 public interface Event {
 }

mpush-api/src/main/java/com/mpush/api/event/HandshakeEvent.java

@@ -4,6 +4,8 @@
 
 /**
  * Created by ohun on 2015/12/29.
+ *
+ * @author ohun@live.cn
  */
 public final class HandshakeEvent implements Event {
     public final Connection connection;

mpush-api/src/main/java/com/mpush/api/event/KickUserEvent.java

@@ -2,6 +2,8 @@
 
 /**
  * Created by ohun on 2015/12/29.
+ *
+ * @author ohun@live.cn
  */
 public final class KickUserEvent implements Event {
     public final String userId;

mpush-api/src/main/java/com/mpush/api/event/RouterChangeEvent.java

@@ -4,6 +4,8 @@
 
 /**
  * Created by ohun on 2016/1/4.
+ *
+ * @author ohun@live.cn
  */
 public final class RouterChangeEvent implements Event {
     public final String userId;

mpush-api/src/main/java/com/mpush/api/exception/CryptoException.java

@@ -2,13 +2,15 @@
 
 /**
  * Created by ohun on 2015/12/23.
+ *
+ * @author ohun@live.cn
  */
 public class CryptoException extends RuntimeException {
-
-	private static final long serialVersionUID = 368277451733324220L;
 
-	public CryptoException(String message) {
+    private static final long serialVersionUID = 368277451733324220L;
+
+    public CryptoException(String message) {
         super(message);
     }
-	
+
 }

mpush-api/src/main/java/com/mpush/api/exception/DecodeException.java

@@ -2,6 +2,8 @@
 
 /**
  * Created by ohun on 2015/12/23.
+ *
+ * @author ohun@live.cn
  */
 public class DecodeException extends RuntimeException {
     public DecodeException(String message) {

mpush-api/src/main/java/com/mpush/api/exception/SendMessageException.java

@@ -2,6 +2,8 @@
 
 /**
  * Created by ohun on 2015/12/30.
+ *
+ * @author ohun@live.cn
  */
 public class SendMessageException extends RuntimeException {
 }

mpush-api/src/main/java/com/mpush/api/protocol/Packet.java

@@ -6,6 +6,8 @@
 /**
  * Created by ohun on 2015/12/19.
  * length(4)+cmd(1)+cc(2)+flags(1)+sessionId(4)+lrc(1)+body(n)
+ *
+ * @author ohun@live.cn
  */
 public final class Packet {
     public static final int HEADER_LEN = 13;

mpush-api/src/main/java/com/mpush/api/router/ClientLocation.java

@@ -4,6 +4,8 @@
 
 /**
  * Created by ohun on 2015/12/23.
+ *
+ * @author ohun@live.cn
  */
 public final class ClientLocation {
 

mpush-api/src/main/java/com/mpush/api/router/Router.java

@@ -2,6 +2,8 @@
 
 /**
  * Created by ohun on 2015/12/23.
+ *
+ * @author ohun@live.cn
  */
 public interface Router<T> {
 

mpush-api/src/main/java/com/mpush/api/router/RouterManager.java

@@ -2,6 +2,8 @@
 
 /**
  * Created by ohun on 2015/12/23.
+ *
+ * @author ohun@live.cn
  */
 public interface RouterManager<R extends Router> {
 

mpush-boot/pom.xml

@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>${mpush.groupId}</groupId>
     <artifactId>mpush-boot</artifactId>
-    <version>${mpush-cs-version}</version>
+    <version>${mpush-boot-version}</version>
     <name>mpush-boot</name>
     <packaging>jar</packaging>
 
@@ -34,7 +34,7 @@
     <build>
         <finalName>boot</finalName>
         <filters>
-            <filter>../conf-${deploy.env}.properties</filter>
+            <filter>../conf/conf-${deploy.env}.properties</filter>
         </filters>
         <resources>
             <resource>
@@ -89,5 +89,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

mpush-boot/src/main/java/com/mpush/Main.java

@@ -1,8 +1,11 @@
 package com.mpush;
 
+import com.mpush.tools.ConsoleLog;
+
 public class Main {
 
     public static void main(String[] args) {
+        ConsoleLog.i("launch app...");
         ServerLauncher launcher = new ServerLauncher();
         launcher.start();
         addHook(launcher);
@@ -12,6 +15,7 @@ private static void addHook(final ServerLauncher serverBoot) {
         Runtime.getRuntime().addShutdownHook(new Thread() {
             public void run() {
                 serverBoot.stop();
+                ConsoleLog.i("jvm exit all server stopped...");
             }
         });
     }

mpush-boot/src/main/java/com/mpush/ServerLauncher.java

@@ -1,14 +1,19 @@
 package com.mpush;
 
 
-import com.mpush.boot.*;
-import com.mpush.zk.ZKServerNode;
 import com.mpush.api.Server;
+import com.mpush.boot.*;
 import com.mpush.core.server.AdminServer;
 import com.mpush.core.server.ConnectionServer;
 import com.mpush.core.server.GatewayServer;
 import com.mpush.tools.config.ConfigCenter;
+import com.mpush.zk.ZKServerNode;
 
+/**
+ * Created by yxx on 2016/5/14.
+ *
+ * @author ohun@live.cn
+ */
 public class ServerLauncher {
     private final ZKServerNode csNode = ZKServerNode.csNode();
 
@@ -18,7 +23,7 @@ public class ServerLauncher {
 
     private final Server gatewayServer = new GatewayServer(gsNode.getPort());
 
-    private final Server adminServer = new AdminServer(ConfigCenter.holder.adminPort());
+    private final Server adminServer = new AdminServer(ConfigCenter.I.adminPort());
 
 
     public void start() {
@@ -29,7 +34,9 @@ public void start() {
                 .setNext(new ServerBoot(connectServer, csNode))
                 .setNext(new ServerBoot(gatewayServer, gsNode))
                 .setNext(new ServerBoot(adminServer, null))
-                .setNext(new EndBoot());
+                .setNext(new HttpProxyBoot())
+                .setNext(new MonitorBoot())
+                .setNext(new LastBoot());
         chain.run();
     }
 

mpush-boot/src/main/java/com/mpush/boot/BootChain.java

@@ -1,5 +1,7 @@
 package com.mpush.boot;
 
+import com.mpush.tools.ConsoleLog;
+
 /**
  * Created by yxx on 2016/5/15.
  *
@@ -20,6 +22,7 @@ private BootJob first() {
         return new BootJob() {
             @Override
             public void run() {
+                ConsoleLog.i("begin run boot chain...");
                 next();
             }
         };

mpush-boot/src/main/java/com/mpush/boot/BootJob.java

@@ -1,5 +1,7 @@
 package com.mpush.boot;
 
+import com.mpush.tools.ConsoleLog;
+
 /**
  * Created by yxx on 2016/5/14.
  *
@@ -12,6 +14,7 @@ public abstract class BootJob {
 
     public void next() {
         if (next != null) {
+            ConsoleLog.i("run next boot [" + next.getClass().getSimpleName() + "]");
             next.run();
         }
     }