Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Launch worker per environment settings #640

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Launch worker per environment settings #640

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dca40c
Merge pull request #15 from nathanmarz/master
anfeng Jul 31, 2013
93b19a0
launch worker per environment settings
anfeng Aug 1, 2013
1418e88
Merge pull request #16 from nathanmarz/master
anfeng Aug 21, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions storm-core/src/clj/backtype/storm/daemon/supervisor.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be good to use the File/separator instead of "/" while we are changing this?

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
Expand Down