update zkclient to 0.10

lyzq · Jun 23, 2017 · 717e2cb · 717e2cb
1 parent 3e5b3e1
commit 717e2cb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -22,7 +22,7 @@
 			<artifactId>zookeeper</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.github.sgroschupf</groupId>
+			<groupId>com.101tec</groupId>
 			<artifactId>zkclient</artifactId>
 		</dependency>
 		<!-- external -->

diff --git a/common/src/main/java/com/alibaba/otter/canal/common/zookeeper/ZooKeeperx.java b/common/src/main/java/com/alibaba/otter/canal/common/zookeeper/ZooKeeperx.java
@@ -8,7 +8,7 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.I0Itec.zkclient.IZkConnection;
+import org.I0Itec.zkclient.ZkConnection;
 import org.I0Itec.zkclient.exception.ZkException;
 import org.apache.commons.lang.StringUtils;
 import org.apache.zookeeper.ClientCnxn;
@@ -32,7 +32,7 @@
  * @author jianghang 2012-7-10 下午02:31:42
  * @version 1.0.0
  */
-public class ZooKeeperx implements IZkConnection {
+public class ZooKeeperx extends ZkConnection {
 
     private static final String SERVER_COMMA            = ";";
     private static final Logger logger                  = LoggerFactory.getLogger(ZooKeeperx.class);
@@ -53,6 +53,7 @@ public ZooKeeperx(String zkServers){
     }
 
     public ZooKeeperx(String zkServers, int sessionTimeOut){
+        super(zkServers, sessionTimeOut);
         _servers = Arrays.asList(StringUtils.split(zkServers, SERVER_COMMA));
         _sessionTimeOut = sessionTimeOut;
     }

diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java
@@ -149,6 +149,11 @@ public void handleStateChanged(KeeperState state) throws Exception {
                                     public void handleNewSession() throws Exception {
                                         initCid(path);
                                     }
+
+                                    @Override
+                                    public void handleSessionEstablishmentError(Throwable error) throws Exception {
+                                        logger.error("failed to connect to zookeeper", error);
+                                    }
                                 });
                             }
                         } finally {
@@ -383,6 +388,11 @@ public void handleStateChanged(KeeperState state) throws Exception {
                 public void handleNewSession() throws Exception {
                     initCid(path);
                 }
+
+                @Override
+                public void handleSessionEstablishmentError(Throwable error) throws Exception {
+                    logger.error("failed to connect to zookeeper", error);
+                }
             });
         }
         // 优先启动embeded服务

diff --git a/pom.xml b/pom.xml
@@ -170,9 +170,9 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>com.github.sgroschupf</groupId>
+                <groupId>com.101tec</groupId>
                 <artifactId>zkclient</artifactId>
-                <version>0.1</version>
+                <version>0.10</version>
             </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>