Repository: storm Updated Branches: refs/heads/master c4bb12463 -> 58c841159
Logger Output Pattern Consistent For Worker and Cluster - Logger output pattern for integration-tests/cluster.xml Matching log42/cluster.xml - Same logger output pattern for cluster.xml and worker.xml Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/927f7e62 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/927f7e62 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/927f7e62 Branch: refs/heads/master Commit: 927f7e62e142f8cd9755bb39e40c91e128477138 Parents: 943bef6 Author: Hugo Louro <hmclo...@gmail.com> Authored: Wed Mar 15 11:48:59 2017 -0700 Committer: Hugo Louro <hmclo...@gmail.com> Committed: Wed Mar 15 23:09:15 2017 -0700 ---------------------------------------------------------------------- integration-test/config/cluster.xml | 19 ++++++++++++------- log4j2/cluster.xml | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/927f7e62/integration-test/config/cluster.xml ---------------------------------------------------------------------- diff --git a/integration-test/config/cluster.xml b/integration-test/config/cluster.xml index d37e6e6..97968e4 100644 --- a/integration-test/config/cluster.xml +++ b/integration-test/config/cluster.xml @@ -18,6 +18,11 @@ --> <configuration scan="true" scanPeriod="60 seconds"> + <properties> + <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} %t [%p] %msg%n</property> + <property name="patternMetrics">%d %-8r %m%n</property> + </properties> + <appender name="A1" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>/var/log/storm/${logfile.name}</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> @@ -31,7 +36,7 @@ </triggeringPolicy> <encoder> - <pattern>%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n</pattern> + <pattern>${pattern}</pattern> </encoder> </appender> @@ -48,7 +53,7 @@ </triggeringPolicy> <encoder> - <pattern>%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n</pattern> + <pattern>${pattern}</pattern> </encoder> </appender> @@ -65,7 +70,7 @@ </triggeringPolicy> <encoder> - <pattern>%d %-8r %m%n</pattern> + <pattern>${patternMetrics}</pattern> </encoder> </appender> @@ -73,22 +78,22 @@ <appender-ref ref="A1"/> </root> - <logger name="backtype.storm.messaging.netty"> + <logger name="org.apache.storm.messaging.netty"> <level value="WARN" /> <appender-ref ref="A1" /> </logger> - <logger name="backtype.storm"> + <logger name="org.apache.storm"> <level value="DEBUG" /> <appender-ref ref="A1" /> </logger> - <logger name="backtype.storm.security.auth.authorizer" additivity="false"> + <logger name="org.apache.storm.security.auth.authorizer" additivity="false"> <level value="INFO" /> <appender-ref ref="ACCESS" /> </logger> - <logger name="backtype.storm.metric.LoggingMetricsConsumer" additivity="false" > + <logger name="org.apache.storm.metric.LoggingMetricsConsumer" additivity="false"> <level value="INFO"/> <appender-ref ref="METRICS"/> </logger> http://git-wip-us.apache.org/repos/asf/storm/blob/927f7e62/log4j2/cluster.xml ---------------------------------------------------------------------- diff --git a/log4j2/cluster.xml b/log4j2/cluster.xml index 088aecf..35ef257 100644 --- a/log4j2/cluster.xml +++ b/log4j2/cluster.xml @@ -18,7 +18,7 @@ <configuration monitorInterval="60" shutdownHook="disable"> <properties> - <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %t %c{1.} [%p] %msg%n</property> + <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} %t [%p] %msg%n</property> </properties> <appenders> <RollingFile name="A1" immediateFlush="false"
