Authored by liangyi.chen@yoho.cn

fix

@@ -90,15 +90,17 @@ public class CanalClientHandler implements InitializingBean, ApplicationEventPub @@ -90,15 +90,17 @@ public class CanalClientHandler implements InitializingBean, ApplicationEventPub
90 for (CanalConfig.CanalInstance instance : canalInstancesList) { 90 for (CanalConfig.CanalInstance instance : canalInstancesList) {
91 threadPool.execute(() -> { 91 threadPool.execute(() -> {
92 Thread.currentThread().setName(Thread.currentThread().getName() + "-" + instance.getDestination()); 92 Thread.currentThread().setName(Thread.currentThread().getName() + "-" + instance.getDestination());
  93 + try {
93 initConnector(instance); 94 initConnector(instance);
94 while (!threadPool.isShutdown() && !threadPool.isTerminated()) { 95 while (!threadPool.isShutdown() && !threadPool.isTerminated()) {
95 - try { 96 +
96 handleCanalMessage(canalInstConnectors.get(instance.getDestination()), instance); 97 handleCanalMessage(canalInstConnectors.get(instance.getDestination()), instance);
97 - } catch (CanalClientException e) { 98 + }
  99 + }catch (CanalClientException e) {
98 //TODO 事件上报 100 //TODO 事件上报
99 logger.error("CanalClientHandler invoke thread error!", e); 101 logger.error("CanalClientHandler invoke thread error!", e);
100 reConnectCanal(instance); 102 reConnectCanal(instance);
101 - } catch (Throwable e) { 103 + }catch (Throwable e) {
102 // 避免未捕获的异常导致连接丢失 104 // 避免未捕获的异常导致连接丢失
103 // TODO 事件上报 105 // TODO 事件上报
104 logger.error("CanalClientHandler invoke thread error!", e); 106 logger.error("CanalClientHandler invoke thread error!", e);
@@ -108,7 +110,6 @@ public class CanalClientHandler implements InitializingBean, ApplicationEventPub @@ -108,7 +110,6 @@ public class CanalClientHandler implements InitializingBean, ApplicationEventPub
108 Thread.currentThread().interrupt(); 110 Thread.currentThread().interrupt();
109 } 111 }
110 } 112 }
111 - }  
112 }); 113 });
113 } 114 }
114 } 115 }