Merge branch 'STORM-493' of https://github.com/chrisz/incubator-storm into STORM-493
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a1e1c1e2 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a1e1c1e2 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a1e1c1e2 Branch: refs/heads/security Commit: a1e1c1e206bcc22d0721226531fb1328c2d8cd53 Parents: 93c4d7e c99145c Author: Sean Zhong <[email protected]> Authored: Tue Nov 4 20:07:08 2014 +0800 Committer: Sean Zhong <[email protected]> Committed: Tue Nov 4 20:07:08 2014 +0800 ---------------------------------------------------------------------- storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 6 +++++- storm-core/test/clj/backtype/storm/supervisor_test.clj | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/a1e1c1e2/storm-core/src/clj/backtype/storm/daemon/supervisor.clj ---------------------------------------------------------------------- diff --cc storm-core/src/clj/backtype/storm/daemon/supervisor.clj index cce89bc,8c18e1c..b370eb7 --- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj +++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj @@@ -502,7 -502,9 +502,9 @@@ :distributed [supervisor storm-id port worker-id] (let [conf (:conf supervisor) storm-home (System/getProperty "storm.home") + storm-options (System/getProperty "storm.options") + storm-conf-file (System/getProperty "storm.conf.file") - storm-log-dir (or (System/getProperty "storm.log.dir") (str storm-home "/logs")) + storm-log-dir (or (System/getProperty "storm.log.dir") (str storm-home file-path-separator "logs")) stormroot (supervisor-stormdist-root conf storm-id) jlp (jlp stormroot conf) stormjar (supervisor-stormjar-path stormroot) @@@ -528,8 -530,10 +530,10 @@@ [(str "-Djava.library.path=" jlp) (str "-Dlogfile.name=" logfilename) (str "-Dstorm.home=" storm-home) + (str "-Dstorm.conf.file=" storm-conf-file) + (str "-Dstorm.options=" storm-options) (str "-Dstorm.log.dir=" storm-log-dir) - (str "-Dlogback.configurationFile=" storm-home "/logback/cluster.xml") + (str "-Dlogback.configurationFile=" storm-home file-path-separator "logback" file-path-separator "cluster.xml") (str "-Dstorm.id=" storm-id) (str "-Dworker.id=" worker-id) (str "-Dworker.port=" port) http://git-wip-us.apache.org/repos/asf/storm/blob/a1e1c1e2/storm-core/test/clj/backtype/storm/supervisor_test.clj ---------------------------------------------------------------------- diff --cc storm-core/test/clj/backtype/storm/supervisor_test.clj index ba74d88,a61a2ae..0bb47f3 --- a/storm-core/test/clj/backtype/storm/supervisor_test.clj +++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj @@@ -255,8 -255,10 +255,10 @@@ ["-Djava.library.path=" (str "-Dlogfile.name=worker-" mock-port ".log") "-Dstorm.home=" + "-Dstorm.conf.file=" + "-Dstorm.options=" - "-Dstorm.log.dir=/logs" - "-Dlogback.configurationFile=/logback/cluster.xml" + (str "-Dstorm.log.dir=" file-path-separator "logs") + (str "-Dlogback.configurationFile=" file-path-separator "logback" file-path-separator "cluster.xml") (str "-Dstorm.id=" mock-storm-id) (str "-Dworker.id=" mock-worker-id) (str "-Dworker.port=" mock-port)
