From 93b19a06309ffb802f0d1fb5307b7791b57b2443 Mon Sep 17 00:00:00 2001 From: anfeng Date: Wed, 31 Jul 2013 17:47:43 -0700 Subject: [PATCH] launch worker per environment settings --- .../src/clj/backtype/storm/daemon/supervisor.clj | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj index 1504431656..0aabd554fd 100644 --- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj +++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj @@ -412,12 +412,17 @@ childopts (.replaceAll (str (conf WORKER-CHILDOPTS) " " (storm-conf TOPOLOGY-WORKER-CHILDOPTS)) "%ID%" (str port)) - logfilename (str "worker-" port ".log") - command (str "java -server " childopts + java_home (System/getenv "JAVA_HOME") + java_cmd (if java_home (str java_home "/bin/java") "java") + worker_logdir (System/getProperty "worker.logdir") + logfilename (str (if worker_logdir (str worker_logdir "/") "") "worker-" port ".log") + logback_configurationFile_property (System/getProperty "logback.configurationFile") + logback_configurationFile (if logback_configurationFile_property (str "-D" logback_configurationFile_property) "") + command (str java_cmd " -server " childopts " -Djava.library.path=" (conf JAVA-LIBRARY-PATH) " -Dlogfile.name=" logfilename " -Dstorm.home=" storm-home - " -Dlogback.configurationFile=" storm-home "/logback/cluster.xml" + logback_configurationFile " -Dstorm.id=" storm-id " -Dworker.id=" worker-id " -Dworker.port=" port