You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/09/30 21:49:47 UTC
[1/6] storm git commit: [STORM-1063] fix log4j conf dir relative path
issue
Repository: storm
Updated Branches:
refs/heads/master 9d911ec1b -> d86cdee85
[STORM-1063] fix log4j conf dir relative path issue
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/94b15624
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/94b15624
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/94b15624
Branch: refs/heads/master
Commit: 94b156243eef1cef6e572e94918ac4153a0f82cf
Parents: 397d2d8
Author: zhuol <zh...@yahoo-inc.com>
Authored: Wed Sep 23 14:37:06 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Wed Sep 23 14:37:06 2015 -0500
----------------------------------------------------------------------
bin/storm.py | 2 ++
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/94b15624/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 024912f..c6c78c3 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -375,6 +375,8 @@ def get_log4j2_conf_dir():
storm_log4j2_conf_dir = confvalue("storm.log4j2.conf.dir", cppaths)
if(storm_log4j2_conf_dir == None or storm_log4j2_conf_dir == "nil"):
storm_log4j2_conf_dir = STORM_LOG4J2_CONF_DIR
+ elif(not os.path.isabs(storm_log4j2_conf_dir)):
+ storm_log4j2_conf_dir = os.path.join(STORM_DIR, storm_log4j2_conf_dir)
return storm_log4j2_conf_dir
def nimbus(klass="backtype.storm.daemon.nimbus"):
http://git-wip-us.apache.org/repos/asf/storm/blob/94b15624/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 2a7613d..f08e49d 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -664,7 +664,11 @@
storm-conf-file (System/getProperty "storm.conf.file")
storm-log-dir (or (System/getProperty "storm.log.dir") (str storm-home file-path-separator "logs"))
storm-log-conf-dir (conf STORM-LOG4J2-CONF-DIR)
- storm-log4j2-conf-dir (or storm-log-conf-dir (str storm-home file-path-separator "log4j2"))
+ storm-log4j2-conf-dir (if storm-log-conf-dir
+ (if (is-absolute-path storm-log-conf-dir)
+ storm-log-conf-dir
+ (str storm-home file-path-separator storm-log-conf-dir))
+ (str storm-home file-path-separator "log4j"))
stormroot (supervisor-stormdist-root conf storm-id)
jlp (jlp stormroot conf)
stormjar (supervisor-stormjar-path stormroot)
[3/6] storm git commit: Minor
Posted by bo...@apache.org.
Minor
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/508a4ef1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/508a4ef1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/508a4ef1
Branch: refs/heads/master
Commit: 508a4ef1f27716f8c6307258303ab4bdb2663330
Parents: e4f780a
Author: zhuol <zh...@yahoo-inc.com>
Authored: Wed Sep 23 20:26:01 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Wed Sep 23 20:26:01 2015 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/508a4ef1/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 982142b..366d069 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -668,7 +668,7 @@
(if (is-absolute-path? storm-log-conf-dir)
storm-log-conf-dir
(str storm-home file-path-separator storm-log-conf-dir))
- (str storm-home file-path-separator "log4j"))
+ (str storm-home file-path-separator "log4j2"))
stormroot (supervisor-stormdist-root conf storm-id)
jlp (jlp stormroot conf)
stormjar (supervisor-stormjar-path stormroot)
[5/6] storm git commit: Merge branch '1063' of
https://github.com/zhuoliu/storm into STORM-1063
Posted by bo...@apache.org.
Merge branch '1063' of https://github.com/zhuoliu/storm into STORM-1063
STORM-1063: support relative log4j conf dir for both daemons and workers
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/52df0dff
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/52df0dff
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/52df0dff
Branch: refs/heads/master
Commit: 52df0dff03ec69ad4a5573b60590d5bd2145fe43
Parents: 9d911ec d519364
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Sep 30 14:31:32 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Sep 30 14:31:32 2015 -0500
----------------------------------------------------------------------
bin/storm.py | 2 ++
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 6 +++++-
storm-core/src/jvm/backtype/storm/Config.java | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[6/6] storm git commit: Added STORM-1063 to Changelog
Posted by bo...@apache.org.
Added STORM-1063 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d86cdee8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d86cdee8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d86cdee8
Branch: refs/heads/master
Commit: d86cdee8500ba0624f56178880b29d8a1a4dc71b
Parents: 52df0df
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Sep 30 14:32:00 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Sep 30 14:32:00 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d86cdee8/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8303bd..8b0fe00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1063: support relative log4j conf dir for both daemons and workers
* STORM-1059: Upgrade Storm to use Clojure 1.7.0
* STORM-1069: add check case for external change of 'now' value.
* STORM-969: HDFS Bolt can end up in an unrecoverable state.
[2/6] storm git commit: Minor fix
Posted by bo...@apache.org.
Minor fix
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e4f780a4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e4f780a4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e4f780a4
Branch: refs/heads/master
Commit: e4f780a4f226c1255871390d7446e20e8eb1c888
Parents: 94b1562
Author: zhuol <zh...@yahoo-inc.com>
Authored: Wed Sep 23 14:41:41 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Wed Sep 23 14:41:41 2015 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e4f780a4/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 f08e49d..982142b 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -665,7 +665,7 @@
storm-log-dir (or (System/getProperty "storm.log.dir") (str storm-home file-path-separator "logs"))
storm-log-conf-dir (conf STORM-LOG4J2-CONF-DIR)
storm-log4j2-conf-dir (if storm-log-conf-dir
- (if (is-absolute-path storm-log-conf-dir)
+ (if (is-absolute-path? storm-log-conf-dir)
storm-log-conf-dir
(str storm-home file-path-separator storm-log-conf-dir))
(str storm-home file-path-separator "log4j"))
[4/6] storm git commit: Update the doc for log4j conf dir config
Posted by bo...@apache.org.
Update the doc for log4j conf dir config
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d5193649
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d5193649
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d5193649
Branch: refs/heads/master
Commit: d5193649334f967ca50dadde665cc38d7cdcc763
Parents: 508a4ef
Author: zhuol <zh...@yahoo-inc.com>
Authored: Wed Sep 23 20:39:57 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Wed Sep 23 20:39:57 2015 -0500
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/Config.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d5193649/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index 0eff51b..c886e40 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -148,6 +148,8 @@ public class Config extends HashMap<String, Object> {
/**
* A directory that holds configuration files for log4j2.
+ * It can be either a relative or an absolute directory.
+ * If relative, it is relative to the storm's home directory.
*/
public static final String STORM_LOG4J2_CONF_DIR = "storm.log4j2.conf.dir";
public static final Object STORM_LOG4J2_CONF_DIR_SCHEMA = String.class;