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:47:49 UTC
[1/3] storm git commit: STORM-945: element
is not a policy, and should not be putted in the element
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 <ca...@gmail.com>
Authored: Fri Jul 17 11:35:11 2015 +0800
Committer: caofangkun <ca...@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"
[3/3] 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/14fdab8b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/14fdab8b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/14fdab8b
Branch: refs/heads/master
Commit: 14fdab8b188080e5f1095ed422c807493ad6fd01
Parents: 61202cc
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Jul 30 23:47:07 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jul 30 23:47:07 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/14fdab8b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ec09e1..6361734 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,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
[2/3] storm git commit: Merge branch 'storm-945' of
https://github.com/caofangkun/apache-storm
Posted by ka...@apache.org.
Merge branch 'storm-945' of https://github.com/caofangkun/apache-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/61202cce
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/61202cce
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/61202cce
Branch: refs/heads/master
Commit: 61202cce113af316f5c97699bf061af3aa1deecf
Parents: 17356bc 740f02e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Jul 30 23:44:01 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jul 30 23:44:01 2015 +0900
----------------------------------------------------------------------
log4j2/cluster.xml | 6 +++---
log4j2/worker.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------