代码优化

mpusher · Jan 23, 2017 · e5ff572 · e5ff572
1 parent 959a3a9
commit e5ff572
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/mpush-api/src/main/java/com/mpush/api/protocol/Packet.java b/mpush-api/src/main/java/com/mpush/api/protocol/Packet.java
@@ -31,6 +31,7 @@
  *
  * @author ohun@live.cn
  */
+@SuppressWarnings("unchecked")
 public class Packet {
     public static final int HEADER_LEN = 13;
 

diff --git a/...client/src/main/java/com/mpush/client/gateway/connection/GatewayTCPConnectionFactory.java b/...client/src/main/java/com/mpush/client/gateway/connection/GatewayTCPConnectionFactory.java
@@ -143,14 +143,14 @@ private void reconnect(Connection connection, String hostAndPort) {
         HostAndPort h_p = HostAndPort.fromString(hostAndPort);
         connections.get(hostAndPort).remove(connection);
         connection.close();
-        addConnection(h_p.getHostText(), h_p.getPort());
+        addConnection(h_p.getHost(), h_p.getPort());
     }
 
     private void removeClient(ServiceNode node) {
         if (node != null) {
-            List<Connection> clients = connections.remove(getHostAndPort(node.getHost(), node.getPort()));
-            if (clients != null) {
-                clients.forEach(Connection::close);
+            List<Connection> list = connections.remove(getHostAndPort(node.getHost(), node.getPort()));
+            if (list != null) {
+                list.forEach(Connection::close);
             }
         }
     }
@@ -175,6 +175,7 @@ void on(ConnectionConnectEvent event) {
         InetSocketAddress address = (InetSocketAddress) connection.getChannel().remoteAddress();
         String hostAndPort = getHostAndPort(address.getAddress().getHostAddress(), address.getPort());
         connections.computeIfAbsent(hostAndPort, key -> new ArrayList<>(gateway_client_num)).add(connection);
+        logger.info("one gateway conn connect, hostAndPort={}, conn={}", hostAndPort, connection);
     }
 
     private static String getHostAndPort(String host, int port) {

diff --git a/mpush-core/src/main/java/com/mpush/core/server/WebSocketServer.java b/mpush-core/src/main/java/com/mpush/core/server/WebSocketServer.java
@@ -54,7 +54,7 @@ public final class WebSocketServer extends NettyTCPServer {
 
     public static WebSocketServer I() {
         if (I == null) {
-            synchronized (ConnectionServer.class) {
+            synchronized (WebSocketServer.class) {
                 if (I == null) {
                     I = new WebSocketServer();
                 }

diff --git a/mpush-tools/src/main/java/com/mpush/tools/Utils.java b/mpush-tools/src/main/java/com/mpush/tools/Utils.java
@@ -112,7 +112,7 @@ public static String getInetAddress(boolean getLocal) {
                     }
                 }
             }
-            LOGGER.debug("getInetAddress is null");
+            LOGGER.debug("getInetAddress is null, getLocal={}", getLocal);
             return getLocal ? "127.0.0.1" : null;
         } catch (Throwable e) {
             LOGGER.error("getInetAddress exception", e);