From 1846e80825f11be48a89ee257e82104eeb23b4c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E9=80=8D=E6=97=AD?= Date: Tue, 31 May 2016 04:52:15 +0200 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/reference.conf | 2 +- .../test/java/com/mpush/test/client/ConnClientTestMain.java | 2 +- mpush-zk/src/main/java/com/mpush/zk/ZKClient.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/reference.conf b/conf/reference.conf index a6fff22d..07526222 100644 --- a/conf/reference.conf +++ b/conf/reference.conf @@ -170,7 +170,7 @@ mp { push-callback { min:2 max:2 - queue-size:1 + queue-size:0 } } } diff --git a/mpush-test/src/test/java/com/mpush/test/client/ConnClientTestMain.java b/mpush-test/src/test/java/com/mpush/test/client/ConnClientTestMain.java index 38cb099d..c8913e04 100644 --- a/mpush-test/src/test/java/com/mpush/test/client/ConnClientTestMain.java +++ b/mpush-test/src/test/java/com/mpush/test/client/ConnClientTestMain.java @@ -41,7 +41,7 @@ public static void main(String[] args) throws Exception { int index = (int) ((Math.random() % serverList.size()) * serverList.size()); ZKServerNode server = serverList.get(index); - server = new ZKServerNode("127.0.0.1", 3000, "127.0.0.1", null); + //server = new ZKServerNode("127.0.0.1", 3000, "127.0.0.1", null); for (int i = 0; i < 1; i++) { String clientVersion = "1.0." + i; String osName = "android"; diff --git a/mpush-zk/src/main/java/com/mpush/zk/ZKClient.java b/mpush-zk/src/main/java/com/mpush/zk/ZKClient.java index c74d2a95..81b578f6 100644 --- a/mpush-zk/src/main/java/com/mpush/zk/ZKClient.java +++ b/mpush-zk/src/main/java/com/mpush/zk/ZKClient.java @@ -64,7 +64,7 @@ protected void doStart(Listener listener) throws Throwable { throw new ZKException("init zk error, config=" + zkConfig); } initLocalCache(zkConfig.getLocalCachePath()); - registerConnectionLostListener(); + addConnectionStateListener(); listener.onSuccess(zkConfig.getHosts()); Logs.ZK.info("zk client start success, server lists is:{}", zkConfig.getHosts()); Logs.Console.error("init zk client success..."); @@ -117,7 +117,7 @@ public List getAclForPath(final String path) { } // 注册连接状态监听器 - private void registerConnectionLostListener() { + private void addConnectionStateListener() { client.getConnectionStateListenable().addListener(new ConnectionStateListener() { //TODO need close jvm? @Override