Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch 2ecbb804e -> 091721dfe


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/981b396d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/981b396d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/981b396d

Branch: refs/heads/1.0.x-branch
Commit: 981b396d68be4becd9fe2c9713217876dfb9e4c2
Parents: 2ecbb80
Author: Hugo Louro <hmclo...@gmail.com>
Authored: Wed Mar 15 11:48:59 2017 -0700
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Mon Mar 20 18:41:36 2017 +0900

----------------------------------------------------------------------
 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/981b396d/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/981b396d/log4j2/cluster.xml
----------------------------------------------------------------------
diff --git a/log4j2/cluster.xml b/log4j2/cluster.xml
index 6a789e4..5bcc694 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"

Reply via email to