You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2015/12/17 21:45:22 UTC
[3/5] storm git commit: namespace dir
namespace dir
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b77dc162
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b77dc162
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b77dc162
Branch: refs/heads/master
Commit: b77dc16247190845ce6bb9c7bc4fc6eeb4c69d57
Parents: a5e4129
Author: zhuol <zh...@yahoo-inc.com>
Authored: Wed Dec 16 12:14:51 2015 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Wed Dec 16 12:14:51 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/config.clj | 4 ++--
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b77dc162/storm-core/src/clj/backtype/storm/config.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/config.clj b/storm-core/src/clj/backtype/storm/config.clj
index d35dc56..04b16e0 100644
--- a/storm-core/src/clj/backtype/storm/config.clj
+++ b/storm-core/src/clj/backtype/storm/config.clj
@@ -264,8 +264,8 @@
(if workers-artifacts-dir
(if (is-absolute-path? workers-artifacts-dir)
workers-artifacts-dir
- (str backtype.storm.config/LOG-DIR file-path-separator workers-artifacts-dir))
- (str backtype.storm.config/LOG-DIR file-path-separator "workers-artifacts"))))
+ (str LOG-DIR file-path-separator workers-artifacts-dir))
+ (str LOG-DIR file-path-separator "workers-artifacts"))))
([conf id]
(str (worker-artifacts-root conf) file-path-separator id))
([conf id port]
http://git-wip-us.apache.org/repos/asf/storm/blob/b77dc162/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 3f4c322..77bdfd1 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -1022,7 +1022,7 @@
storm-home (System/getProperty "storm.home")
storm-options (System/getProperty "storm.options")
storm-conf-file (System/getProperty "storm.conf.file")
- storm-log-dir backtype.storm.config/LOG-DIR
+ storm-log-dir LOG-DIR
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)