Skip to content

Commit

Permalink
重构代码
Browse files Browse the repository at this point in the history
  • Loading branch information
黄志磊 committed Jan 16, 2016
1 parent d5825b6 commit 12f03fd
Show file tree
Hide file tree
Showing 8 changed files with 305 additions and 306 deletions.
Expand Up @@ -110,7 +110,7 @@ public void registerServerToZk(){
zkRegister.registerEphemeralSequential(application.getServerRegisterZkPath(), Jsons.toJson(app));
}

public void init(){
public void start(){
initZK();
initRedis();
initListenerData();
Expand Down
2 changes: 1 addition & 1 deletion mpush-core/src/main/resources/config.properties
Expand Up @@ -34,7 +34,7 @@ compress_limit = 10240
max_packet_size = 10240

## zk 配置项
zk_ip = 10.1.30.2:2181
zk_ip = 10.1.10.41:2181
zk_namespace = mpush
zk_digest = shinemoIpo

Expand Down
13 changes: 0 additions & 13 deletions mpush-cs/src/main/java/com/shinemo/mpush/App.java

This file was deleted.

Expand Up @@ -27,5 +27,10 @@ public Server getServer() {
return connectionServer;
}


public static void main(String[] args) {
ConnectionServerMain connectionServerMain = new ConnectionServerMain();
connectionServerMain.start();
}

}
@@ -1,5 +1,7 @@
package com.shinemo.mpush.cs.zk.listener.impl;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.recipes.cache.TreeCacheEvent;
import org.slf4j.Logger;
Expand All @@ -22,7 +24,11 @@ public void initData() {

@Override
public void dataChanged(CuratorFramework client, TreeCacheEvent event, String path) throws Exception {

String data = "";
if (event.getData() != null) {
data = ToStringBuilder.reflectionToString(event.getData(), ToStringStyle.MULTI_LINE_STYLE);
}
log.warn("ConnPathListener other path:" + path + "," + event.getType().name() + "," + data);
}

@Override
Expand Down
Expand Up @@ -3,16 +3,22 @@
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.recipes.cache.TreeCacheEvent;
import org.apache.curator.framework.recipes.cache.TreeCacheListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public abstract class DataChangeListener implements TreeCacheListener{

private static final Logger log = LoggerFactory.getLogger(DataChangeListener.class);

@Override
public void childEvent(CuratorFramework client, TreeCacheEvent event) throws Exception {
String path = null == event.getData() ? "" : event.getData().getPath();
if (path.isEmpty()) {
return;
}

log.warn("DataChangeListener:"+path);

if(listenerPath().equals(path)){
dataChanged(client, event, path);
}
Expand Down
@@ -1,113 +1,109 @@
//package com.shinemo.mpush.tools.redis;
//
//import java.util.Date;
//import java.util.List;
//
//import com.shinemo.mpush.tools.redis.listener.MessageListener;
//import com.shinemo.mpush.tools.zk.ZKPath;
//
//import org.apache.commons.lang3.builder.ToStringBuilder;
//import org.apache.commons.lang3.builder.ToStringStyle;
//import org.junit.Before;
//import org.junit.Test;
//
//import com.shinemo.mpush.tools.MPushUtil;
//import com.shinemo.mpush.tools.redis.manage.RedisManage;
//import com.shinemo.mpush.tools.redis.pubsub.Subscriber;
//import com.shinemo.mpush.tools.spi.ServiceContainer;
//import com.shinemo.mpush.tools.zk.ServerApp;
//import com.shinemo.mpush.tools.zk.manage.ServerManage;
//
//public class RedisGroupManageTest {
//
// ServerApp app = new ServerApp(MPushUtil.getLocalIp(), 3000);
// ServerManage manage = new ServerManage(app, ZKPath.REDIS_SERVER);
// List<RedisGroup> groupList = null;
//
// RedisNode node = new RedisNode("127.0.0.1", 6379, "ShineMoIpo");
// RedisNode node2 = new RedisNode("127.0.0.1", 6380, "ShineMoIpo");
//
// RedisRegister redisRegister = ServiceContainer.getInstance(RedisRegister.class);
//
// @Before
// public void init() {
// manage.start();
// groupList = redisRegister.getGroupList();
// }
//
// @Test
// public void testGetRedisGroup() {
// for (RedisGroup group : groupList) {
// for (RedisNode node : group.getRedisNodeList()) {
// System.out.println(group + ToStringBuilder.reflectionToString(node, ToStringStyle.MULTI_LINE_STYLE));
// }
//
// }
// }
//
// @Test
// public void testAdd() {
// User user = RedisManage.get("huang2", User.class);
// if (user == null) {
// user = new User("hi", 10, new Date());
// RedisManage.set("huang2", user);
// user = RedisManage.get("huang2", User.class);
// }
// System.out.println(ToStringBuilder.reflectionToString(user, ToStringStyle.MULTI_LINE_STYLE));
//
// User nowUser = RedisUtil.get(node, "huang2", User.class);
// System.out.println("node1:" + ToStringBuilder.reflectionToString(nowUser));
//
// nowUser = RedisUtil.get(node2, "huang2", User.class);
// System.out.println("node2:" + ToStringBuilder.reflectionToString(nowUser));
//
// RedisManage.del("huang2");
//
// nowUser = RedisUtil.get(node2, "huang2", User.class);
// if (nowUser == null) {
// System.out.println("node2 nowUser is null");
// } else {
// System.out.println("node2:" + ToStringBuilder.reflectionToString(nowUser));
// }
//
// nowUser = RedisUtil.get(node, "huang2", User.class);
// System.out.println("node:" + ToStringBuilder.reflectionToString(nowUser));
//
// }
//
// @Test
// public void testPub() {
// for (int i = 0; i < 20; i++) {
// User user = new User("pub" + i, 10, new Date());
// RedisManage.publish("channel1", user);
// RedisManage.publish("channel2", user);
// }
// }
//
// @Test
// public void testSub() {
// RedisManage.subscribe(new MessageListener() {
// @Override
// public void onMessage(String channel, String message) {
// System.out.printf("on message channel=%s, message=%s%n", channel, message);
// }
// }, "channel1", "channel2");
// try {
// Thread.sleep(Integer.MAX_VALUE);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
// }
//
// @Test
// public void testSub2() {
// RedisManage.subscribe(new Subscriber(), "channel1", "channel2");
// try {
// Thread.sleep(Integer.MAX_VALUE);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
// }
//
//
//}
package com.shinemo.mpush.tools.redis;

import java.util.Date;
import java.util.List;

import com.shinemo.mpush.tools.redis.listener.MessageListener;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.junit.Before;
import org.junit.Test;

import com.shinemo.mpush.tools.MPushUtil;
import com.shinemo.mpush.tools.redis.manage.RedisManage;
import com.shinemo.mpush.tools.redis.pubsub.Subscriber;
import com.shinemo.mpush.tools.spi.ServiceContainer;
import com.shinemo.mpush.tools.zk.ServerApp;

public class RedisGroupManageTest {

ServerApp app = new ServerApp(MPushUtil.getLocalIp(), 3000);
List<RedisGroup> groupList = null;

RedisNode node = new RedisNode("127.0.0.1", 6379, "ShineMoIpo");
RedisNode node2 = new RedisNode("127.0.0.1", 6380, "ShineMoIpo");

RedisRegister redisRegister = ServiceContainer.getInstance(RedisRegister.class);

@Before
public void init() {
groupList = redisRegister.getGroupList();
}

@Test
public void testGetRedisGroup() {
for (RedisGroup group : groupList) {
for (RedisNode node : group.getRedisNodeList()) {
System.out.println(group + ToStringBuilder.reflectionToString(node, ToStringStyle.MULTI_LINE_STYLE));
}

}
}

@Test
public void testAdd() {
User user = RedisManage.get("huang2", User.class);
if (user == null) {
user = new User("hi", 10, new Date());
RedisManage.set("huang2", user);
user = RedisManage.get("huang2", User.class);
}
System.out.println(ToStringBuilder.reflectionToString(user, ToStringStyle.MULTI_LINE_STYLE));

User nowUser = RedisUtil.get(node, "huang2", User.class);
System.out.println("node1:" + ToStringBuilder.reflectionToString(nowUser));

nowUser = RedisUtil.get(node2, "huang2", User.class);
System.out.println("node2:" + ToStringBuilder.reflectionToString(nowUser));

RedisManage.del("huang2");

nowUser = RedisUtil.get(node2, "huang2", User.class);
if (nowUser == null) {
System.out.println("node2 nowUser is null");
} else {
System.out.println("node2:" + ToStringBuilder.reflectionToString(nowUser));
}

nowUser = RedisUtil.get(node, "huang2", User.class);
System.out.println("node:" + ToStringBuilder.reflectionToString(nowUser));

}

@Test
public void testPub() {
for (int i = 0; i < 20; i++) {
User user = new User("pub" + i, 10, new Date());
RedisManage.publish("channel1", user);
RedisManage.publish("channel2", user);
}
}

@Test
public void testSub() {
RedisManage.subscribe(new MessageListener() {
@Override
public void onMessage(String channel, String message) {
System.out.printf("on message channel=%s, message=%s%n", channel, message);
}
}, "channel1", "channel2");
try {
Thread.sleep(Integer.MAX_VALUE);
} catch (InterruptedException e) {
e.printStackTrace();
}
}

@Test
public void testSub2() {
RedisManage.subscribe(new Subscriber(), "channel1", "channel2");
try {
Thread.sleep(Integer.MAX_VALUE);
} catch (InterruptedException e) {
e.printStackTrace();
}
}


}

0 comments on commit 12f03fd

Please sign in to comment.