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/30 16:49:40 UTC
[1/2] storm git commit: STORM-945: element
is not a policy, and should not be putted in the element
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch 05bd1e366 -> 1dd0b52a6
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/882ef178
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/882ef178
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/882ef178
Branch: refs/heads/0.10.x-branch
Commit: 882ef17837e35377bca20e465808e91d1a0a8caa
Parents: 05bd1e3
Author: caofangkun <ca...@gmail.com>
Authored: Fri Jul 17 11:35:11 2015 +0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jul 30 23:48:17 2015 +0900
----------------------------------------------------------------------
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/882ef178/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/882ef178/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"
[2/2] storm git commit: add STORM-945 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-945 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1dd0b52a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1dd0b52a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1dd0b52a
Branch: refs/heads/0.10.x-branch
Commit: 1dd0b52a6a3530fc3967ef07a482f9105e34cb56
Parents: 882ef17
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Jul 30 23:49:18 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jul 30 23:49:18 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1dd0b52a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a931709..ee80a39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
* STORM-866: Use storm.log.dir instead of storm.home in log4j2 config
* STORM-810: PartitionManager in storm-kafka should commit latest offset before close
* STORM-928: Add sources->streams->fields map to Multi-Lang Handshake
+ * STORM-945: <DefaultRolloverStrategy> element is not a policy,and should not be putted in the <Policies> element.
## 0.10.0-beta1
* STORM-873: Flux does not handle diamond topologies