From 6a3cca4aabedd12cc86fa006423a682a7b4f5336 Mon Sep 17 00:00:00 2001
From: xiajun <xiajun@xiaomi.com>
Date: Fri, 12 Jun 2015 13:04:29 +0800
Subject: [PATCH 1/2] STORM-866: Use storm.log.dir instead of storm.home in
 log4j2 config

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

diff --git a/log4j2/cluster.xml b/log4j2/cluster.xml
index 2301e2143a3..fc64677a861 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>
diff --git a/log4j2/worker.xml b/log4j2/worker.xml
index 54d612ce416..785de010463 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>

From 6e0b56c100138c0b5881716932178c262b1a3683 Mon Sep 17 00:00:00 2001
From: xiajun <xiajun@xiaomi.com>
Date: Fri, 12 Jun 2015 13:19:59 +0800
Subject: [PATCH 2/2] remove logs

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

diff --git a/log4j2/cluster.xml b/log4j2/cluster.xml
index fc64677a861..73e34558c57 100644
--- a/log4j2/cluster.xml
+++ b/log4j2/cluster.xml
@@ -23,8 +23,8 @@
 </properties>
 <appenders>
     <RollingFile name="A1"
-                 fileName="${sys:storm.log.dir}/logs/${sys:logfile.name}"
-                 filePattern="${sys:storm.log.dir}/logs/${sys:logfile.name}.%i">
+                 fileName="${sys:storm.log.dir}/${sys:logfile.name}"
+                 filePattern="${sys:storm.log.dir}/${sys:logfile.name}.%i">
         <PatternLayout>
             <pattern>${pattern}</pattern>
         </PatternLayout>
@@ -34,8 +34,8 @@
         </Policies>
     </RollingFile>
     <RollingFile name="ACCESS"
-                 fileName="${sys:storm.log.dir}/logs/access.log"
-                 filePattern="${sys:storm.log.dir}/logs/access.log.%i">
+                 fileName="${sys:storm.log.dir}/access.log"
+                 filePattern="${sys:storm.log.dir}/access.log.%i">
         <PatternLayout>
             <pattern>${pattern}</pattern>
         </PatternLayout>
@@ -45,8 +45,8 @@
         </Policies>
     </RollingFile>
     <RollingFile name="METRICS"
-                 fileName="${sys:storm.log.dir}/logs/metrics.log"
-                 filePattern="${sys:storm.log.dir}/logs/metrics.log.%i">
+                 fileName="${sys:storm.log.dir}/metrics.log"
+                 filePattern="${sys:storm.log.dir}/metrics.log.%i">
         <PatternLayout>
             <pattern>${patternMetris}</pattern>
         </PatternLayout>
diff --git a/log4j2/worker.xml b/log4j2/worker.xml
index 785de010463..cfcdf5e0e47 100644
--- a/log4j2/worker.xml
+++ b/log4j2/worker.xml
@@ -23,8 +23,8 @@
 </properties>
 <appenders>
     <RollingFile name="A1"
-                 fileName="${sys:storm.log.dir}/logs/${sys:logfile.name}"
-                 filePattern="${sys:storm.log.dir}/logs/${sys:logfile.name}.%i.gz">
+                 fileName="${sys:storm.log.dir}/${sys:logfile.name}"
+                 filePattern="${sys:storm.log.dir}/${sys:logfile.name}.%i.gz">
         <PatternLayout>
             <pattern>${pattern}</pattern>
         </PatternLayout>
@@ -34,8 +34,8 @@
         </Policies>
     </RollingFile>
     <RollingFile name="STDOUT"
-                 fileName="${sys:storm.log.dir}/logs/${sys:logfile.name}.out"
-                 filePattern="${sys:storm.log.dir}/logs/${sys:logfile.name}.out.%i.gz">
+                 fileName="${sys:storm.log.dir}/${sys:logfile.name}.out"
+                 filePattern="${sys:storm.log.dir}/${sys:logfile.name}.out.%i.gz">
         <PatternLayout>
             <pattern>${patternNoTime}</pattern>
         </PatternLayout>
@@ -45,8 +45,8 @@
         </Policies>
     </RollingFile>
     <RollingFile name="STDERR"
-                 fileName="${sys:storm.log.dir}/logs/${sys:logfile.name}.err"
-                 filePattern="${sys:storm.log.dir}/logs/${sys:logfile.name}.err.%i.gz">
+                 fileName="${sys:storm.log.dir}/${sys:logfile.name}.err"
+                 filePattern="${sys:storm.log.dir}/${sys:logfile.name}.err.%i.gz">
         <PatternLayout>
             <pattern>${patternNoTime}</pattern>
         </PatternLayout>