SLIDER-153 add JVM args to CLI
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8a8ffd94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8a8ffd94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8a8ffd94 Branch: refs/heads/feature/SLIDER-153_add_slider_py_command Commit: 8a8ffd94c9b9685df578ba493e6cb0148af0e5b1 Parents: 77f3e02 Author: Steve Loughran <ste...@apache.org> Authored: Tue Jun 24 13:19:49 2014 -0700 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Jun 24 13:19:49 2014 -0700 ---------------------------------------------------------------------- slider-assembly/src/main/scripts/slider.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8a8ffd94/slider-assembly/src/main/scripts/slider.py ---------------------------------------------------------------------- diff --git a/slider-assembly/src/main/scripts/slider.py b/slider-assembly/src/main/scripts/slider.py index 77c39aa..d48eca6 100644 --- a/slider-assembly/src/main/scripts/slider.py +++ b/slider-assembly/src/main/scripts/slider.py @@ -30,14 +30,12 @@ SLIDER_CLASSPATH_EXTRA = "SLIDER_CLASSPATH_EXTRA" SLIDER_CLASSNAME = "org.apache.slider.Slider" DEFAULT_JVM__OPTS = "-Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Xmx256m -Djava.confdir=%s" -"""Launches slider - - """ +Launches slider +""" -print os.environ['HOME'] def scriptDir(): @@ -107,6 +105,8 @@ def main(): confdir = dirMustExist(confDir(slider_home)) default_jvm_opts = DEFAULT_JVM__OPTS % confdir slider_jvm_opts = os.environ.get(SLIDER_JVM_OPTS, default_jvm_opts) + # split the JVM opts by space + jvm_opts_split = slider_jvm_opts.split() slider_classpath_extra = os.environ.get(SLIDER_CLASSPATH_EXTRA, "") p = os.pathsep # path separator d = os.sep # dir separator @@ -120,12 +120,11 @@ def main(): print "slider_classpath = \"%s\"" % slider_classpath #java = "/usr/bin/java" - java = "java" - commandline = [java, - "-classpath", - slider_classpath, - SLIDER_CLASSNAME] - # commandline.append(slider_jvm_opts) + commandline = ["java", ] + commandline.append("-classpath") + commandline.append(slider_classpath) + commandline.extend(jvm_opts_split) + commandline.append(SLIDER_CLASSNAME) commandline.extend(args) print "ready to exec : %s" % commandline # docs warn of using PIPE on stderr