chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

make canal.admin.port canal.admin.user canal.admin.passwd can be override by system env properties (#2274)

Browse Source 
* Update SimpleAdminConnectors.java

add more information about which server execute failed

* Update CanalStarter.java

make canal.admin.port canal.admin.user canal.admin.passwd can be override by system env
This commit is contained in:
craigwu9
2019-09-30 20:45:00 +08:00
committed by agapple
parent dd93e2b0c4
commit e4e66b143c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/connector/SimpleAdminConnectors.java
View File

@@ -25,6 +25,7 @@ public class SimpleAdminConnectors {
connector.connect(); connector.connect();
return function.apply(connector); return function.apply(connector);
} catch (Exception e) { } catch (Exception e) {
logger.error("connect to ip:{},port:{},user:{},password:{}, failed", ip, port, user,passwd);
logger.error(e.getMessage()); logger.error(e.getMessage());
} finally { } finally {
connector.disconnect(); connector.disconnect();

11
deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalStarter.java
View File

@@ -109,15 +109,18 @@ public class CanalStarter {
} }
// start canalAdmin // start canalAdmin
String port = properties.getProperty(CanalConstants.CANAL_ADMIN_PORT); String port = CanalController.getProperty(properties, CanalConstants.CANAL_ADMIN_PORT);
if (canalAdmin == null && StringUtils.isNotEmpty(port)) { if (canalAdmin == null && StringUtils.isNotEmpty(port)) {
String user = properties.getProperty(CanalConstants.CANAL_ADMIN_USER); String user = CanalController.getProperty(properties, CanalConstants.CANAL_ADMIN_USER);
String passwd = properties.getProperty(CanalConstants.CANAL_ADMIN_PASSWD); String passwd = CanalController.getProperty(properties, CanalConstants.CANAL_ADMIN_PASSWD);
CanalAdminController canalAdmin = new CanalAdminController(this); CanalAdminController canalAdmin = new CanalAdminController(this);
canalAdmin.setUser(user); canalAdmin.setUser(user);
canalAdmin.setPasswd(passwd); canalAdmin.setPasswd(passwd);
String ip = properties.getProperty(CanalConstants.CANAL_IP); String ip = CanalController.getProperty(properties, CanalConstants.CANAL_IP);
logger.debug("canal admin port:{}, canal admin user:{}, canal admin password: {}, canal ip:{}", port, user, passwd, ip);
CanalAdminWithNetty canalAdminWithNetty = CanalAdminWithNetty.instance(); CanalAdminWithNetty canalAdminWithNetty = CanalAdminWithNetty.instance();
canalAdminWithNetty.setCanalAdmin(canalAdmin); canalAdminWithNetty.setCanalAdmin(canalAdmin);
canalAdminWithNetty.setPort(Integer.valueOf(port)); canalAdminWithNetty.setPort(Integer.valueOf(port));