You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/07/08 04:21:36 UTC

[2/5] storm git commit: STORM-866: Use storm.log.dir instead of storm.home in log4j2 config

STORM-866: Use storm.log.dir instead of storm.home in log4j2 config


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6694e588
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6694e588
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6694e588

Branch: refs/heads/0.10.x-branch
Commit: 6694e5886e8f6edf935dacba3d4f839f348689c4
Parents: 0b4844f
Author: xiajun <xi...@xiaomi.com>
Authored: Fri Jun 12 13:04:29 2015 +0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Jul 8 11:06:44 2015 +0900

----------------------------------------------------------------------
 log4j2/cluster.xml | 12 ++++++------
 log4j2/worker.xml  | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/6694e588/log4j2/cluster.xml
----------------------------------------------------------------------
diff --git a/log4j2/cluster.xml b/log4j2/cluster.xml
index 2301e21..fc64677 100644
--- a/log4j2/cluster.xml
+++ b/log4j2/cluster.xml
@@ -23,8 +23,8 @@
 </properties>
 <appenders>
     <RollingFile name="A1"
-                 fileName="${sys:storm.home}/logs/${sys:logfile.name}"
-                 filePattern="${sys:storm.home}/logs/${sys:logfile.name}.%i">
+                 fileName="${sys:storm.log.dir}/logs/${sys:logfile.name}"
+                 filePattern="${sys:storm.log.dir}/logs/${sys:logfile.name}.%i">
         <PatternLayout>
             <pattern>${pattern}</pattern>
         </PatternLayout>
@@ -34,8 +34,8 @@
         </Policies>
     </RollingFile>
     <RollingFile name="ACCESS"
-                 fileName="${sys:storm.home}/logs/access.log"
-                 filePattern="${sys:storm.home}/logs/access.log.%i">
+                 fileName="${sys:storm.log.dir}/logs/access.log"
+                 filePattern="${sys:storm.log.dir}/logs/access.log.%i">
         <PatternLayout>
             <pattern>${pattern}</pattern>
         </PatternLayout>
@@ -45,8 +45,8 @@
         </Policies>
     </RollingFile>
     <RollingFile name="METRICS"
-                 fileName="${sys:storm.home}/logs/metrics.log"
-                 filePattern="${sys:storm.home}/logs/metrics.log.%i">
+                 fileName="${sys:storm.log.dir}/logs/metrics.log"
+                 filePattern="${sys:storm.log.dir}/logs/metrics.log.%i">
         <PatternLayout>
             <pattern>${patternMetris}</pattern>
         </PatternLayout>

http://git-wip-us.apache.org/repos/asf/storm/blob/6694e588/log4j2/worker.xml
----------------------------------------------------------------------
diff --git a/log4j2/worker.xml b/log4j2/worker.xml
index 54d612c..785de01 100644
--- a/log4j2/worker.xml
+++ b/log4j2/worker.xml
@@ -23,8 +23,8 @@
 </properties>
 <appenders>
     <RollingFile name="A1"
-                 fileName="${sys:storm.home}/logs/${sys:logfile.name}"
-                 filePattern="${sys:storm.home}/logs/${sys:logfile.name}.%i.gz">
+                 fileName="${sys:storm.log.dir}/logs/${sys:logfile.name}"
+                 filePattern="${sys:storm.log.dir}/logs/${sys:logfile.name}.%i.gz">
         <PatternLayout>
             <pattern>${pattern}</pattern>
         </PatternLayout>
@@ -34,8 +34,8 @@
         </Policies>
     </RollingFile>
     <RollingFile name="STDOUT"
-                 fileName="${sys:storm.home}/logs/${sys:logfile.name}.out"
-                 filePattern="${sys:storm.home}/logs/${sys:logfile.name}.out.%i.gz">
+                 fileName="${sys:storm.log.dir}/logs/${sys:logfile.name}.out"
+                 filePattern="${sys:storm.log.dir}/logs/${sys:logfile.name}.out.%i.gz">
         <PatternLayout>
             <pattern>${patternNoTime}</pattern>
         </PatternLayout>
@@ -45,8 +45,8 @@
         </Policies>
     </RollingFile>
     <RollingFile name="STDERR"
-                 fileName="${sys:storm.home}/logs/${sys:logfile.name}.err"
-                 filePattern="${sys:storm.home}/logs/${sys:logfile.name}.err.%i.gz">
+                 fileName="${sys:storm.log.dir}/logs/${sys:logfile.name}.err"
+                 filePattern="${sys:storm.log.dir}/logs/${sys:logfile.name}.err.%i.gz">
         <PatternLayout>
             <pattern>${patternNoTime}</pattern>
         </PatternLayout>