Merge branch 'conffile'

smtp2006 · Oct 18, 2012 · a62807c · a62807c
2 parents 97091a9 + 6cf1734
commit a62807c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/bin/storm b/bin/storm
@@ -25,6 +25,7 @@ else:
 CONF_DIR = os.path.expanduser("~/.storm")
 STORM_DIR = "/".join(os.path.realpath( __file__ ).split("/")[:-2])
 CONFIG_OPTS = []
+CONFFILE = ""
 
 def get_config_opts():
     global CONFIG_OPTS
@@ -52,8 +53,9 @@ def get_classpath(extrajars):
     return normclasspath(":".join(ret))
 
 def confvalue(name, extrapaths):
+    global CONFFILE
     command = [
-        "java", "-client", get_config_opts(), "-cp", get_classpath(extrapaths), "backtype.storm.command.config_value", name
+        "java", "-client", get_config_opts(), "-Dstorm.conf.file=" + CONFFILE, "-cp", get_classpath(extrapaths), "backtype.storm.command.config_value", name
     ]
     p = sub.Popen(command, stdout=sub.PIPE)
     output, errors = p.communicate()
@@ -104,10 +106,12 @@ def parse_args(string):
     return [re.compile(r'\\(.)').sub('\\1', x) for x in args]
 
 def exec_storm_class(klass, jvmtype="-server", jvmopts=[], extrajars=[], args=[], fork=False):
+    global CONFFILE
     all_args = [
         "java", jvmtype, get_config_opts(),
         "-Dstorm.home=" + STORM_DIR, 
         "-Djava.library.path=" + confvalue("java.library.path", extrajars),
+        "-Dstorm.conf.file=" + CONFFILE,
         "-cp", get_classpath(extrajars),
     ] + jvmopts + [klass] + list(args)
     print "Running: " + " ".join(all_args)
@@ -382,6 +386,9 @@ def parse_config_opts(args):
     token = curr.pop()
     if token == "-c":
       config_list.append(curr.pop())
+    elif token == "--config":
+      global CONFFILE
+      CONFFILE = curr.pop()
     else:
       args_list.append(token)
 

diff --git a/src/jvm/backtype/storm/utils/Utils.java b/src/jvm/backtype/storm/utils/Utils.java
@@ -153,7 +153,13 @@ public static Map readCommandLineOpts() {
 
     public static Map readStormConfig() {
         Map ret = readDefaultConfig();
-        Map storm = findAndReadConfigFile("storm.yaml", false);
+        String confFile = System.getProperty("storm.conf.file");
+        Map storm;
+        if (confFile==null || confFile.equals("")) {
+            storm = findAndReadConfigFile("storm.yaml", false);
+        } else {
+            storm = findAndReadConfigFile(confFile, true);
+        }
         ret.putAll(storm);
         ret.putAll(readCommandLineOpts());
         return ret;