udp gateway 模式下取消redis踢人消息订阅

mpusher · Dec 11, 2016 · 0e67f51 · 0e67f51
1 parent 695a1d6
commit 0e67f51
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/mpush-cache/src/main/java/com/mpush/cache/redis/listener/ListenerDispatcher.java b/mpush-cache/src/main/java/com/mpush/cache/redis/listener/ListenerDispatcher.java
@@ -54,12 +54,7 @@ public void onMessage(final String channel, final String message) {
     }
 
     public void subscribe(String channel, MessageListener listener) {
-        List<MessageListener> listeners = subscribes.get(channel);
-        if (listeners == null) {
-            listeners = Lists.newArrayList();
-            subscribes.put(channel, listeners);
-        }
-        listeners.add(listener);
+        subscribes.computeIfAbsent(channel, k -> Lists.newArrayList()).add(listener);
         RedisManager.I.subscribe(Subscriber.holder, channel);
     }
 }
diff --git a/mpush-core/src/main/java/com/mpush/core/router/RouterChangeListener.java b/mpush-core/src/main/java/com/mpush/core/router/RouterChangeListener.java
@@ -51,9 +51,12 @@
 public final class RouterChangeListener extends EventConsumer implements MessageListener {
     public static final String KICK_CHANNEL_ = "/mpush/kick/";
     private final String kick_channel = KICK_CHANNEL_ + GS_NODE.getHostAndPort();
+    private final boolean udpGateway = CC.mp.net.udpGateway();
 
     public RouterChangeListener() {
-        ListenerDispatcher.I.subscribe(getKickChannel(), this);
+        if (!udpGateway) {
+            ListenerDispatcher.I.subscribe(getKickChannel(), this);
+        }
     }
 
     public String getKickChannel() {
@@ -113,7 +116,7 @@ private void kickRemote(String userId, RemoteRouter remoteRouter) {
             return;
         }
 
-        if (CC.mp.net.udpGateway()) {
+        if (udpGateway) {
             Connection connection = GatewayUDPConnector.I().getConnection();
             GatewayKickUserMessage.build(connection)
                     .setUserId(userId)