diff --git a/client/src/main/java/com/alibaba/otter/canal/client/CanalConnectors.java b/client/src/main/java/com/alibaba/otter/canal/client/CanalConnectors.java index d64bd491..391b21dc 100644 --- a/client/src/main/java/com/alibaba/otter/canal/client/CanalConnectors.java +++ b/client/src/main/java/com/alibaba/otter/canal/client/CanalConnectors.java @@ -44,8 +44,10 @@ public class CanalConnectors { */ public static CanalConnector newClusterConnector(List addresses, String destination, String username, String password) { - ClusterCanalConnector canalConnector = new ClusterCanalConnector(username, password, destination, - new SimpleNodeAccessStrategy(addresses)); + ClusterCanalConnector canalConnector = new ClusterCanalConnector(username, + password, + destination, + new SimpleNodeAccessStrategy(addresses)); canalConnector.setSoTimeout(30 * 1000); return canalConnector; } @@ -61,13 +63,10 @@ public class CanalConnectors { */ public static CanalConnector newClusterConnector(String zkServers, String destination, String username, String password) { - ClusterCanalConnector canalConnector = new ClusterCanalConnector( - username, - password, - destination, - new ClusterNodeAccessStrategy( - destination, - ZkClientx.getZkClient(zkServers))); + ClusterCanalConnector canalConnector = new ClusterCanalConnector(username, + password, + destination, + new ClusterNodeAccessStrategy(destination, ZkClientx.getZkClient(zkServers))); canalConnector.setSoTimeout(30 * 1000); return canalConnector; } diff --git a/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java b/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java index 7993669d..a432e668 100644 --- a/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java +++ b/client/src/main/java/com/alibaba/otter/canal/client/impl/SimpleCanalConnector.java @@ -102,7 +102,7 @@ public class SimpleCanalConnector implements CanalConnector { rollback(); } } - + connected = true; } @@ -411,7 +411,6 @@ public class SimpleCanalConnector implements CanalConnector { } } - private void waitClientRunning() { try { if (zkClientx != null) { diff --git a/codeformat.xml b/codeformat.xml new file mode 100644 index 00000000..01b28b5b --- /dev/null +++ b/codeformat.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/codetemplates.xml b/codetemplates.xml new file mode 100644 index 00000000..20ee0fc1 --- /dev/null +++ b/codetemplates.xml @@ -0,0 +1,27 @@ +