mirror of
https://github.com/alibaba/canal.git
synced 2026-11-04 00:30:15 +08:00
支持定义rocketmq client日志路径,及修复一些bug (#3229)
* 修复接入阿里云RocketMq no route info for this topic 问题 * 支持deployer同步rocketmq时定义rocketmq client日志路径 * 支持deployer同步rocketmq时定义rocketmq client日志路径 * 回退guava版本号,解决adapter的java.lang.NoSuchMethodError: com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor()异常 * 解决adapter启动报com.alibaba.druid.pool.DruidDataSource cannot be cast to com.alibaba.druid.pool.DruidDataSource异常。 * 支持rocketmq client 配置日志路径 Co-authored-by: hai.yu <hai.yu@snowballtech.com> Co-authored-by: agapple <jianghang.loujh@alibaba-inc.com>
This commit is contained in:
@@ -13,6 +13,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
public class CanalAdapterApplication {
|
public class CanalAdapterApplication {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
// 支持rocketmq client 配置日志路径
|
||||||
|
System.setProperty("rocketmq.client.logUseSlf4j","true");
|
||||||
|
|
||||||
SpringApplication application = new SpringApplication(CanalAdapterApplication.class);
|
SpringApplication application = new SpringApplication(CanalAdapterApplication.class);
|
||||||
application.setBannerMode(Banner.Mode.OFF);
|
application.setBannerMode(Banner.Mode.OFF);
|
||||||
|
|||||||
@@ -34,6 +34,23 @@
|
|||||||
</sift>
|
</sift>
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
|
<appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
|
<file>../logs/rocketmq_client/rocketmq_client.log</file>
|
||||||
|
<rollingPolicy
|
||||||
|
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
|
<!-- rollover daily -->
|
||||||
|
<fileNamePattern>../logs/rocketmq_client/%d{yyyy-MM-dd}/rocketmq_client-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
|
||||||
|
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
|
||||||
|
<!-- or whenever the file size reaches 100MB -->
|
||||||
|
<maxFileSize>512MB</maxFileSize>
|
||||||
|
</timeBasedFileNamingAndTriggeringPolicy>
|
||||||
|
<maxHistory>60</maxHistory>
|
||||||
|
</rollingPolicy>
|
||||||
|
<encoder charset="UTF-8">
|
||||||
|
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56} - %msg%n</pattern>
|
||||||
|
</encoder>
|
||||||
|
</appender>
|
||||||
|
|
||||||
<logger name="com.alibaba.otter.canal.client.adapter.hbase" additivity="false">
|
<logger name="com.alibaba.otter.canal.client.adapter.hbase" additivity="false">
|
||||||
<level value="DEBUG" />
|
<level value="DEBUG" />
|
||||||
<appender-ref ref="STDOUT"/>
|
<appender-ref ref="STDOUT"/>
|
||||||
@@ -54,6 +71,10 @@
|
|||||||
<appender-ref ref="STDOUT"/>
|
<appender-ref ref="STDOUT"/>
|
||||||
<appender-ref ref="CANAL-ROOT" />
|
<appender-ref ref="CANAL-ROOT" />
|
||||||
</logger>
|
</logger>
|
||||||
|
<logger name="RocketmqClient" additivity="false">
|
||||||
|
<level value="INFO" />
|
||||||
|
<appender-ref ref="RocketmqClientAppender" />
|
||||||
|
</logger>
|
||||||
|
|
||||||
<root level="INFO">
|
<root level="INFO">
|
||||||
<appender-ref ref="STDOUT"/>
|
<appender-ref ref="STDOUT"/>
|
||||||
|
|||||||
@@ -36,6 +36,9 @@ public class CanalLauncher {
|
|||||||
logger.info("## set default uncaught exception handler");
|
logger.info("## set default uncaught exception handler");
|
||||||
setGlobalUncaughtExceptionHandler();
|
setGlobalUncaughtExceptionHandler();
|
||||||
|
|
||||||
|
// 支持rocketmq client 配置日志路径
|
||||||
|
System.setProperty("rocketmq.client.logUseSlf4j","true");
|
||||||
|
|
||||||
logger.info("## load canal configurations");
|
logger.info("## load canal configurations");
|
||||||
String conf = System.getProperty("canal.conf", "classpath:canal.properties");
|
String conf = System.getProperty("canal.conf", "classpath:canal.properties");
|
||||||
Properties properties = new Properties();
|
Properties properties = new Properties();
|
||||||
|
|||||||
@@ -61,6 +61,23 @@
|
|||||||
</sift>
|
</sift>
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
|
<appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
|
<file>../logs/rocketmq_client/rocketmq_client.log</file>
|
||||||
|
<rollingPolicy
|
||||||
|
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
|
<!-- rollover daily -->
|
||||||
|
<fileNamePattern>../logs/rocketmq_client/%d{yyyy-MM-dd}/rocketmq_client-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
|
||||||
|
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
|
||||||
|
<!-- or whenever the file size reaches 100MB -->
|
||||||
|
<maxFileSize>512MB</maxFileSize>
|
||||||
|
</timeBasedFileNamingAndTriggeringPolicy>
|
||||||
|
<maxHistory>60</maxHistory>
|
||||||
|
</rollingPolicy>
|
||||||
|
<encoder charset="UTF-8">
|
||||||
|
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56} - %msg%n</pattern>
|
||||||
|
</encoder>
|
||||||
|
</appender>
|
||||||
|
|
||||||
<logger name="com.alibaba.otter.canal.instance" additivity="false">
|
<logger name="com.alibaba.otter.canal.instance" additivity="false">
|
||||||
<level value="INFO" />
|
<level value="INFO" />
|
||||||
<appender-ref ref="CANAL-ROOT" />
|
<appender-ref ref="CANAL-ROOT" />
|
||||||
@@ -85,6 +102,10 @@
|
|||||||
<level value="INFO" />
|
<level value="INFO" />
|
||||||
<appender-ref ref="CANAL-ROOT" />
|
<appender-ref ref="CANAL-ROOT" />
|
||||||
</logger>
|
</logger>
|
||||||
|
<logger name="RocketmqClient" additivity="false">
|
||||||
|
<level value="INFO" />
|
||||||
|
<appender-ref ref="RocketmqClientAppender" />
|
||||||
|
</logger>
|
||||||
<logger name="com.alibaba.otter.canal.connector.pulsarmq" additivity="false">
|
<logger name="com.alibaba.otter.canal.connector.pulsarmq" additivity="false">
|
||||||
<level value="INFO" />
|
<level value="INFO" />
|
||||||
<appender-ref ref="CANAL-ROOT" />
|
<appender-ref ref="CANAL-ROOT" />
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@@ -226,7 +226,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.guava</groupId>
|
<groupId>com.google.guava</groupId>
|
||||||
<artifactId>guava</artifactId>
|
<artifactId>guava</artifactId>
|
||||||
<version>22.0</version>
|
<version>18.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.googlecode.aviator</groupId>
|
<groupId>com.googlecode.aviator</groupId>
|
||||||
|
|||||||
Reference in New Issue
Block a user