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/06/30 23:40:32 UTC
[1/4] storm git commit: STORM-866: Use storm.log.dir instead of
storm.home in log4j2 config
Repository: storm
Updated Branches:
refs/heads/master 27a3a6bb7 -> 4a66ab97f
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/6a3cca4a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6a3cca4a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6a3cca4a
Branch: refs/heads/master
Commit: 6a3cca4aabedd12cc86fa006423a682a7b4f5336
Parents: 58372f0
Author: xiajun <xi...@xiaomi.com>
Authored: Fri Jun 12 13:04:29 2015 +0800
Committer: xiajun <xi...@xiaomi.com>
Committed: Fri Jun 12 13:04:29 2015 +0800
----------------------------------------------------------------------
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/6a3cca4a/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/6a3cca4a/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>
[3/4] storm git commit: Merge branch
'ted-use-storm.log.dir-in-log4j2-config' of https://github.com/tedxia/storm
Posted by ka...@apache.org.
Merge branch 'ted-use-storm.log.dir-in-log4j2-config' of https://github.com/tedxia/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0f7349d1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0f7349d1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0f7349d1
Branch: refs/heads/master
Commit: 0f7349d168a0e60fd1fd242276d80e1b02200932
Parents: 27a3a6b 6e0b56c
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Jul 1 06:21:09 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Jul 1 06:21:09 2015 +0900
----------------------------------------------------------------------
log4j2/cluster.xml | 12 ++++++------
log4j2/worker.xml | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[2/4] storm git commit: remove logs
Posted by ka...@apache.org.
remove logs
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6e0b56c1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6e0b56c1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6e0b56c1
Branch: refs/heads/master
Commit: 6e0b56c100138c0b5881716932178c262b1a3683
Parents: 6a3cca4
Author: xiajun <xi...@xiaomi.com>
Authored: Fri Jun 12 13:19:59 2015 +0800
Committer: xiajun <xi...@xiaomi.com>
Committed: Fri Jun 12 13:19:59 2015 +0800
----------------------------------------------------------------------
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/6e0b56c1/log4j2/cluster.xml
----------------------------------------------------------------------
diff --git a/log4j2/cluster.xml b/log4j2/cluster.xml
index fc64677..73e3455 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>
http://git-wip-us.apache.org/repos/asf/storm/blob/6e0b56c1/log4j2/worker.xml
----------------------------------------------------------------------
diff --git a/log4j2/worker.xml b/log4j2/worker.xml
index 785de01..cfcdf5e 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>
[4/4] storm git commit: add STORM-866 to CHANGELOG
Posted by ka...@apache.org.
add STORM-866 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4a66ab97
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4a66ab97
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4a66ab97
Branch: refs/heads/master
Commit: 4a66ab97f72cd26d8a7e4f2527e8d30d14cede00
Parents: 0f7349d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Jul 1 06:24:00 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Jul 1 06:24:00 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4a66ab97/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index defa79c..9c4d642 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
* STORM-826: Update KafkaBolt to use the new kafka producer API
* STORM-843: [storm-redis] Add Javadoc to storm-redis
* STORM-912: Support SSL on Logviewer
+ * STORM-866: Use storm.log.dir instead of storm.home in log4j2 config
+
## 0.10.0-beta
* STORM-867: fix bug with mk-ssl-connector