You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/08/08 21:48:35 UTC
[24/50] [abbrv] git commit: STORM-279. cluster.xml doesn't take in
STORM_LOG_DIR values.
STORM-279. cluster.xml doesn't take in STORM_LOG_DIR values.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/6e6aeb9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/6e6aeb9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/6e6aeb9a
Branch: refs/heads/master
Commit: 6e6aeb9a770df6d119e0db3273981f1d12c3aac7
Parents: 85c9cd5
Author: Sriharsha Chintalapani <ma...@harsha.io>
Authored: Sun Jul 20 13:32:52 2014 -0700
Committer: Sriharsha Chintalapani <ma...@harsha.io>
Committed: Sun Jul 20 13:32:52 2014 -0700
----------------------------------------------------------------------
bin/storm | 6 +++++-
logback/cluster.xml | 12 ++++++------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 ++
storm-core/test/clj/backtype/storm/supervisor_test.clj | 2 +-
4 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/6e6aeb9a/bin/storm
----------------------------------------------------------------------
diff --git a/bin/storm b/bin/storm
index a4aadb1..b8478bf 100755
--- a/bin/storm
+++ b/bin/storm
@@ -163,9 +163,13 @@ def parse_args(string):
def exec_storm_class(klass, jvmtype="-server", jvmopts=[], extrajars=[], args=[], fork=False):
global CONFFILE
+ storm_log_dir = confvalue("storm.log.dir",[CLUSTER_CONF_DIR])
+ if(storm_log_dir == None or storm_log_dir == "nil"):
+ storm_log_dir = STORM_DIR+"/logs"
all_args = [
JAVA_CMD, jvmtype, get_config_opts(),
- "-Dstorm.home=" + STORM_DIR,
+ "-Dstorm.home=" + STORM_DIR,
+ "-Dstorm.log.dir=" + storm_log_dir,
"-Djava.library.path=" + confvalue("java.library.path", extrajars),
"-Dstorm.conf.file=" + CONFFILE,
"-cp", get_classpath(extrajars),
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/6e6aeb9a/logback/cluster.xml
----------------------------------------------------------------------
diff --git a/logback/cluster.xml b/logback/cluster.xml
index a761c12..c2def42 100644
--- a/logback/cluster.xml
+++ b/logback/cluster.xml
@@ -18,9 +18,9 @@
<configuration scan="true" scanPeriod="60 seconds">
<appender name="A1" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${storm.home}/logs/${logfile.name}</file>
+ <file>${storm.log.dir}/${logfile.name}</file>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${storm.home}/logs/${logfile.name}.%i</fileNamePattern>
+ <fileNamePattern>${storm.log.dir}/${logfile.name}.%i</fileNamePattern>
<minIndex>1</minIndex>
<maxIndex>9</maxIndex>
</rollingPolicy>
@@ -35,9 +35,9 @@
</appender>
<appender name="ACCESS" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${storm.home}/logs/access.log</file>
+ <file>${storm.log.dir}/access.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${storm.home}/logs/access.log.%i</fileNamePattern>
+ <fileNamePattern>${storm.log.dir}/access.log.%i</fileNamePattern>
<minIndex>1</minIndex>
<maxIndex>9</maxIndex>
</rollingPolicy>
@@ -52,9 +52,9 @@
</appender>
<appender name="METRICS" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${storm.home}/logs/metrics.log</file>
+ <file>${storm.log.dir}/metrics.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${storm.home}/logs/metrics.log.%i</fileNamePattern>
+ <fileNamePattern>${storm.log.dir}/logs/metrics.log.%i</fileNamePattern>
<minIndex>1</minIndex>
<maxIndex>9</maxIndex>
</rollingPolicy>
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/6e6aeb9a/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 7ba1c69..8adadf0 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -480,6 +480,7 @@
:distributed [supervisor storm-id port worker-id]
(let [conf (:conf supervisor)
storm-home (System/getProperty "storm.home")
+ storm-log-dir (or (System/getProperty "storm.log.dir") (str storm-home "/logs"))
stormroot (supervisor-stormdist-root conf storm-id)
jlp (jlp stormroot conf)
stormjar (supervisor-stormjar-path stormroot)
@@ -505,6 +506,7 @@
[(str "-Djava.library.path=" jlp)
(str "-Dlogfile.name=" logfilename)
(str "-Dstorm.home=" storm-home)
+ (str "-Dstorm.log.dir=" storm-log-dir)
(str "-Dlogback.configurationFile=" storm-home "/logback/cluster.xml")
(str "-Dstorm.id=" storm-id)
(str "-Dworker.id=" worker-id)
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/6e6aeb9a/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 eb69f11..b1b023d 100644
--- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
+++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
@@ -254,6 +254,7 @@
["-Djava.library.path="
(str "-Dlogfile.name=worker-" mock-port ".log")
"-Dstorm.home="
+ "-Dstorm.log.dir=/logs"
"-Dlogback.configurationFile=/logback/cluster.xml"
(str "-Dstorm.id=" mock-storm-id)
(str "-Dworker.id=" mock-worker-id)
@@ -351,4 +352,3 @@
(deftest cleans-up-on-unassign
;; TODO just do reassign, and check that cleans up worker states after killing but doesn't get rid of downloaded code
)
-