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/09/05 16:35:22 UTC
[1/3] storm git commit: Pass -Dstorm.log.dir arg to LogWriter
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch 631d1cb2e -> bb32ce9d6
Pass -Dstorm.log.dir arg to LogWriter
Conflicts:
storm-core/src/clj/backtype/storm/daemon/supervisor.clj
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/73c2a150
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/73c2a150
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/73c2a150
Branch: refs/heads/0.10.x-branch
Commit: 73c2a15013ca4e690c09063f1712a1135cacc5bf
Parents: 631d1cb
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Wed Sep 2 10:31:13 2015 -0700
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Sep 5 23:20:11 2015 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/73c2a150/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index 87a2d3f..94a6818 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -692,6 +692,7 @@
(str "-Dstorm.id=" storm-id)
(str "-Dworker.id=" worker-id)
(str "-Dworker.port=" port)
+ (str "-Dstorm.log.dir=" storm-log-dir)
(str "-Dlog4j.configurationFile=" storm-logback-conf-dir file-path-separator "worker.xml")
"backtype.storm.LogWriter"]
[(java-cmd) "-server"]
[2/3] storm git commit: fix supervisor tests
Posted by ka...@apache.org.
fix supervisor tests
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/56ecc9e9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/56ecc9e9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/56ecc9e9
Branch: refs/heads/0.10.x-branch
Commit: 56ecc9e907aef192fe8bbf9cacf0455a861884bd
Parents: 73c2a15
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Sep 5 23:20:23 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Sep 5 23:20:23 2015 +0900
----------------------------------------------------------------------
storm-core/test/clj/backtype/storm/supervisor_test.clj | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/56ecc9e9/storm-core/test/clj/backtype/storm/supervisor_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/supervisor_test.clj b/storm-core/test/clj/backtype/storm/supervisor_test.clj
index dcb8dab..e3c1595 100644
--- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
+++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
@@ -261,6 +261,7 @@
(str "-Dstorm.id=" mock-storm-id)
(str "-Dworker.id=" mock-worker-id)
(str "-Dworker.port=" mock-port)
+ "-Dstorm.log.dir=/logs"
"-Dlog4j.configurationFile=/log4j2/worker.xml"
"backtype.storm.LogWriter"]
[(supervisor/java-cmd) "-server"]
@@ -392,6 +393,7 @@
" '-Dstorm.id=" mock-storm-id "'"
" '-Dworker.id=" mock-worker-id "'"
" '-Dworker.port=" mock-port "'"
+ " '-Dstorm.log.dir=/logs'"
" '-Dlog4j.configurationFile=/log4j2/worker.xml'"
" 'backtype.storm.LogWriter'"
" 'java' '-server'"
[3/3] storm git commit: add STORM-1024 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1024 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/bb32ce9d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bb32ce9d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bb32ce9d
Branch: refs/heads/0.10.x-branch
Commit: bb32ce9d60c0ea2c44f27e1cdf67e937aa0b50df
Parents: 56ecc9e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Sep 5 23:23:26 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Sep 5 23:23:26 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bb32ce9d/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9da136..1487d04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.10.0-beta2
+ * STORM-1024: log4j changes leaving ${sys:storm.log.dir} under STORM_HOME dir
* STORM-996: netty-unit-tests/test-batch demonstrates out-of-order delivery
* STORM-944: storm-hive pom.xml has a dependency conflict with calcite
* STORM-994: Connection leak between nimbus and supervisors