diff --git a/common/pom.xml b/common/pom.xml
index 96f1ba8f..6a6df57b 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -22,7 +22,7 @@
zookeeper
- com.github.sgroschupf
+ com.101tec
zkclient
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
index a3b68dae..24fc83ab 100644
--- 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.List;
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 @@ import org.springframework.util.ReflectionUtils;
* @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 class ZooKeeperx implements IZkConnection {
}
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
index a5ff5b8f..dff994cb 100644
--- 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 class CanalController {
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 class CanalController {
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
index 03bec07c..2b991bd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,9 +170,9 @@
- com.github.sgroschupf
+ com.101tec
zkclient
- 0.1
+ 0.10
com.alibaba