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 2016/03/02 18:27:35 UTC
[2/9] storm git commit: append "/logs" to "storm.local.dir" property
when non-null
append "/logs" to "storm.local.dir" property when non-null
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/504c11b8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/504c11b8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/504c11b8
Branch: refs/heads/master
Commit: 504c11b8ead80e186ff0de83dbdece2337cd1162
Parents: 034f0cf
Author: 卫乐 <we...@taobao.com>
Authored: Sun Feb 28 22:42:56 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Sun Feb 28 22:42:56 2016 +0800
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/504c11b8/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
index b4b3ea6..36d4352 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
@@ -67,7 +67,7 @@ public class ConfigUtils {
} else if ((conf = readStormConfig()).get("storm.log.dir") != null) {
dir = String.valueOf(conf.get("storm.log.dir"));
} else if (System.getProperty("storm.local.dir") != null) {
- dir = System.getProperty("storm.local.dir");
+ dir = System.getProperty("storm.local.dir") + FILE_SEPARATOR + "logs";
} else if (conf.get("storm.local.dir") != null) {
dir = conf.get("storm.local.dir") + FILE_SEPARATOR + "logs";
} else {