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

fixed mq and client launcher

Browse Source
This commit is contained in:
七锋
2018-09-04 12:35:20 +08:00
parent a9cccb3017
commit f5bf1667a9
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java
View File

@@ -387,7 +387,7 @@ public class CanalController {
return config;
}
private String getProperty(Properties properties, String key) {
public String getProperty(Properties properties, String key) {
key = StringUtils.trim(key);
String value = System.getProperty(key);

8
deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalLauncher.java
View File

@@ -3,12 +3,13 @@ package com.alibaba.otter.canal.deployer;
import java.io.FileInputStream;
import java.util.Properties;
import com.alibaba.otter.canal.kafka.CanalKafkaStarter;
import com.alibaba.otter.canal.server.CanalServerStarter;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.alibaba.otter.canal.kafka.CanalKafkaStarter;
import com.alibaba.otter.canal.server.CanalServerStarter;
/**
* canal独立版本启动的入口类
*
@@ -55,12 +56,13 @@ public class CanalLauncher {
});
CanalServerStarter canalServerStarter = null;
String serverMode = properties.getProperty(CanalConstants.CANAL_SERVER_MODE, "tcp");
String serverMode = controller.getProperty(properties, CanalConstants.CANAL_SERVER_MODE);
if (serverMode.equalsIgnoreCase("kafka")) {
canalServerStarter = new CanalKafkaStarter();
} else if (serverMode.equalsIgnoreCase("rocketMQ")) {
// 预留rocketMQ启动
}
if (canalServerStarter != null) {
canalServerStarter.init();
}

4
deployer/src/main/resources/kafka.yml
View File

@@ -12,6 +12,4 @@ canalGetTimeout: 100
canalDestinations:
- canalDestination: example
topic: example
partition:
partition: