修改redis manage

mpusher · Feb 4, 2016 · 6a1ea57 · 6a1ea57
1 parent c88ff6e
commit 6a1ea57
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 16 deletions.
diff --git a/...mpush/tools/redis/ConsistentHashTest.java → .../mpush/test/redis/ConsistentHashTest.java b/...mpush/tools/redis/ConsistentHashTest.java → .../mpush/test/redis/ConsistentHashTest.java
@@ -1,4 +1,4 @@
-package com.shinemo.mpush.tools.redis;
+package com.shinemo.mpush.test.redis;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/mpush-test/src/main/java/com/shinemo/mpush/test/redis/PubSubTest.java b/mpush-test/src/main/java/com/shinemo/mpush/test/redis/PubSubTest.java
@@ -0,0 +1,40 @@
+package com.shinemo.mpush.test.redis;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.common.collect.Lists;
+import com.shinemo.mpush.tools.redis.RedisGroup;
+import com.shinemo.mpush.tools.redis.RedisNode;
+import com.shinemo.mpush.tools.redis.RedisRegister;
+import com.shinemo.mpush.tools.redis.manage.RedisManage;
+import com.shinemo.mpush.tools.redis.pubsub.Subscriber;
+import com.shinemo.mpush.tools.spi.ServiceContainer;
+
+public class PubSubTest {
+
+    private RedisRegister redisRegister = ServiceContainer.getInstance(RedisRegister.class);
+
+    @Before
+    public void init(){
+    	RedisNode node = new RedisNode("127.0.0.1", 6379, "shinemoIpo");
+    	RedisGroup group = new RedisGroup();
+    	group.addRedisNode(node);
+    	List<RedisGroup> listGroup = Lists.newArrayList(group);
+    	redisRegister.init(listGroup);
+    }
+
+	@Test
+	public void pubSubTest(){
+
+		RedisManage.subscribe(Subscriber.holder, "/hello/123");
+
+		RedisManage.subscribe(Subscriber.holder, "/hello/124");
+
+		RedisManage.publish("/hello/123", "123");
+		RedisManage.publish("/hello/124", "124");
+	}
+
+}
diff --git a/...o/mpush/tools/redis/RedisClusterTest.java → ...mo/mpush/test/redis/RedisClusterTest.java b/...o/mpush/tools/redis/RedisClusterTest.java → ...mo/mpush/test/redis/RedisClusterTest.java
@@ -1,4 +1,4 @@
-package com.shinemo.mpush.tools.redis;
+package com.shinemo.mpush.test.redis;
 
 import java.util.Date;
 import java.util.HashSet;
@@ -10,6 +10,7 @@
 import org.junit.Test;
 
 import com.shinemo.mpush.tools.Jsons;
+import com.shinemo.mpush.tools.redis.RedisPoolConfig;
 
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.JedisCluster;

diff --git a/...ush/tools/redis/RedisGroupManageTest.java → ...push/test/redis/RedisGroupManageTest.java b/...ush/tools/redis/RedisGroupManageTest.java → ...push/test/redis/RedisGroupManageTest.java
diff --git a/...nemo/mpush/tools/redis/RedisUtilTest.java → ...inemo/mpush/test/redis/RedisUtilTest.java b/...nemo/mpush/tools/redis/RedisUtilTest.java → ...inemo/mpush/test/redis/RedisUtilTest.java
@@ -1,4 +1,4 @@
-package com.shinemo.mpush.tools.redis;
+package com.shinemo.mpush.test.redis;
 
 import java.util.Date;
 import java.util.Iterator;
@@ -9,6 +9,8 @@
 import org.junit.Test;
 
 import com.google.common.collect.Lists;
+import com.shinemo.mpush.tools.redis.RedisNode;
+import com.shinemo.mpush.tools.redis.RedisUtil;
 
 import redis.clients.jedis.Jedis;
 

diff --git a/...a/com/shinemo/mpush/tools/redis/User.java → ...va/com/shinemo/mpush/test/redis/User.java b/...a/com/shinemo/mpush/tools/redis/User.java → ...va/com/shinemo/mpush/test/redis/User.java
@@ -1,4 +1,4 @@
-package com.shinemo.mpush.tools.redis;
+package com.shinemo.mpush.test.redis;
 
 import java.io.Serializable;
 import java.util.Date;

diff --git a/mpush-tools/src/main/java/com/shinemo/mpush/tools/redis/RedisNode.java b/mpush-tools/src/main/java/com/shinemo/mpush/tools/redis/RedisNode.java
@@ -33,5 +33,9 @@ public RedisNode(String ip, int port, String password) {
 		this.port = port;
 		this.password = password;
 	}
+	@Override
+	public String toString() {
+		return "RedisNode [ip=" + ip + ", port=" + port + ", password=" + password + "]";
+	}
 
 }
diff --git a/mpush-tools/src/main/java/com/shinemo/mpush/tools/redis/RedisUtil.java b/mpush-tools/src/main/java/com/shinemo/mpush/tools/redis/RedisUtil.java
@@ -470,7 +470,7 @@ public static <T> void publish(RedisNode node, String channel, T message) {
             jedis = getClient(node);
             jedis.publish(channel, value);
         } catch (Exception e) {
-        	LoggerManage.execption(LogType.REDIS, e, "redis publish exception:%s,%s,%s",value,node,channel);
+        	LoggerManage.execption(LogType.REDIS, e, "redis publish exception:%s,%s,%s",value,Jsons.toJson(node),Jsons.toJson(channel));
         } finally {
             // 返还到连接池
             close(jedis);
@@ -485,7 +485,7 @@ public static void subscribe(Set<RedisNode> nodeList, final JedisPubSub pubsub,
 				public void run() {
 					subscribe(node, pubsub, channels);
 				}
-			});
+			}).start();
         }
     }
 
@@ -496,7 +496,7 @@ public static void subscribe(RedisNode node, JedisPubSub pubsub, String... chann
             jedis = getClient(node);
             jedis.subscribe(pubsub, channel);
         } catch (Exception e) {
-        	LoggerManage.execption(LogType.REDIS, e, "redis subscribe exception:%s,%s",node,channel);
+        	LoggerManage.execption(LogType.REDIS, e, "redis subscribe exception:%s,%s",Jsons.toJson(node),Jsons.toJson(channel));
         } finally {
             // 返还到连接池
             close(jedis);

diff --git a/...ools/src/main/java/com/shinemo/mpush/tools/redis/jedis/services/JedisRegisterManager.java b/...ools/src/main/java/com/shinemo/mpush/tools/redis/jedis/services/JedisRegisterManager.java
@@ -3,11 +3,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.collect.Lists;
 import com.shinemo.mpush.log.LogType;
 import com.shinemo.mpush.log.LoggerManage;
@@ -18,8 +13,6 @@
 
 public class JedisRegisterManager implements RedisRegister{
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(JedisRegisterManager.class);
-
     private static List<RedisGroup> groups = Lists.newArrayList();
 
     /**

diff --git a/mpush-tools/src/main/java/com/shinemo/mpush/tools/redis/listener/ListenerDispatcher.java b/mpush-tools/src/main/java/com/shinemo/mpush/tools/redis/listener/ListenerDispatcher.java
@@ -6,6 +6,8 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.shinemo.mpush.log.LogType;
+import com.shinemo.mpush.log.LoggerManage;
 import com.shinemo.mpush.tools.redis.manage.RedisManage;
 import com.shinemo.mpush.tools.redis.pubsub.Subscriber;
 import com.shinemo.mpush.tools.thread.threadpool.ThreadPoolManager;
@@ -15,13 +17,16 @@ public class ListenerDispatcher implements MessageListener {
     public static final ListenerDispatcher INSTANCE = new ListenerDispatcher();
 
     private Map<String, List<MessageListener>> subscribes = Maps.newTreeMap();
+
+    private ListenerDispatcher(){}
 
     private Executor executor = ThreadPoolManager.redisExecutor;
 
     @Override
     public void onMessage(final String channel, final String message) {
         List<MessageListener> listeners = subscribes.get(channel);
         if (listeners == null) {
+        	LoggerManage.info(LogType.REDIS, "cannot find listener:%s,%s", channel,message);
             return;
         }
         for (final MessageListener listener : listeners) {
@@ -41,7 +46,6 @@ public void subscribe(String channel, MessageListener listener) {
             subscribes.put(channel, listeners);
         }
         listeners.add(listener);
-        Subscriber subscriber = new Subscriber();
-        RedisManage.subscribe(subscriber, channel);
+        RedisManage.subscribe(Subscriber.holder, channel);
     }
 }
diff --git a/mpush-tools/src/main/java/com/shinemo/mpush/tools/redis/pubsub/Subscriber.java b/mpush-tools/src/main/java/com/shinemo/mpush/tools/redis/pubsub/Subscriber.java
@@ -11,6 +11,10 @@ public class Subscriber extends JedisPubSub {
 
     private static ListenerDispatcher dispatcher = ListenerDispatcher.INSTANCE;
 
+    public static Subscriber holder = new Subscriber();
+
+    private Subscriber(){}
+
     @Override
     public void onMessage(String channel, String message) {
     	LoggerManage.log(LogType.REDIS, "onMessage:%s,%s", channel,message);