Repository: storm
Updated Branches:
  refs/heads/master 17356bc34 -> 14fdab8b1


STORM-945:<DefaultRolloverStrategy> element is not a policy,and should not be 
putted in the <Policies> element


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

Branch: refs/heads/master
Commit: 740f02ee0025cc0307a1422205f9612ce18d3652
Parents: 3466d35
Author: caofangkun <caofang...@gmail.com>
Authored: Fri Jul 17 11:35:11 2015 +0800
Committer: caofangkun <caofang...@gmail.com>
Committed: Fri Jul 17 11:35:11 2015 +0800

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


http://git-wip-us.apache.org/repos/asf/storm/blob/740f02ee/log4j2/cluster.xml
----------------------------------------------------------------------
diff --git a/log4j2/cluster.xml b/log4j2/cluster.xml
index 73e3455..bb96646 100644
--- a/log4j2/cluster.xml
+++ b/log4j2/cluster.xml
@@ -30,8 +30,8 @@
         </PatternLayout>
         <Policies>
             <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-            <DefaultRolloverStrategy max="9"/>
         </Policies>
+        <DefaultRolloverStrategy max="9"/>
     </RollingFile>
     <RollingFile name="ACCESS"
                  fileName="${sys:storm.log.dir}/access.log"
@@ -41,8 +41,8 @@
         </PatternLayout>
         <Policies>
             <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-            <DefaultRolloverStrategy max="9"/>
         </Policies>
+        <DefaultRolloverStrategy max="9"/>
     </RollingFile>
     <RollingFile name="METRICS"
                  fileName="${sys:storm.log.dir}/metrics.log"
@@ -52,8 +52,8 @@
         </PatternLayout>
         <Policies>
             <SizeBasedTriggeringPolicy size="2 MB"/> <!-- Or every 100 MB -->
-            <DefaultRolloverStrategy max="9"/>
         </Policies>
+        <DefaultRolloverStrategy max="9"/>
     </RollingFile>
     <Syslog name="syslog" format="RFC5424" host="localhost" port="514"
             protocol="UDP" appName="[${sys:daemon.name}]" mdcId="mdc" 
includeMDC="true"

http://git-wip-us.apache.org/repos/asf/storm/blob/740f02ee/log4j2/worker.xml
----------------------------------------------------------------------
diff --git a/log4j2/worker.xml b/log4j2/worker.xml
index cfcdf5e..2017699 100644
--- a/log4j2/worker.xml
+++ b/log4j2/worker.xml
@@ -30,8 +30,8 @@
         </PatternLayout>
         <Policies>
             <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-            <DefaultRolloverStrategy max="9"/>
         </Policies>
+        <DefaultRolloverStrategy max="9"/>
     </RollingFile>
     <RollingFile name="STDOUT"
                  fileName="${sys:storm.log.dir}/${sys:logfile.name}.out"
@@ -41,8 +41,8 @@
         </PatternLayout>
         <Policies>
             <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-            <DefaultRolloverStrategy max="4"/>
         </Policies>
+        <DefaultRolloverStrategy max="4"/>
     </RollingFile>
     <RollingFile name="STDERR"
                  fileName="${sys:storm.log.dir}/${sys:logfile.name}.err"
@@ -52,8 +52,8 @@
         </PatternLayout>
         <Policies>
             <SizeBasedTriggeringPolicy size="100 MB"/> <!-- Or every 100 MB -->
-            <DefaultRolloverStrategy max="4"/>
         </Policies>
+        <DefaultRolloverStrategy max="4"/>
     </RollingFile>
     <Syslog name="syslog" format="RFC5424" host="localhost" port="514"
         protocol="UDP" appName="[${sys:storm.id}:${sys:worker.port}]" 
mdcId="mdc" includeMDC="true"

Reply via email to