You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2014/06/20 00:10:53 UTC
[1/3] git commit: STORM-320: Support STORM_CONF_DIR environment
variable to support alternate location of storm.yaml file.
Repository: incubator-storm
Updated Branches:
refs/heads/master 093ce720e -> 5c82b9fed
STORM-320: Support STORM_CONF_DIR environment variable to support
alternate location of storm.yaml file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/c7b22382
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/c7b22382
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/c7b22382
Branch: refs/heads/master
Commit: c7b223824df12858f3029010d655b72f13d777fb
Parents: 222c725
Author: Albert Chu <ch...@llnl.gov>
Authored: Wed May 14 10:37:09 2014 -0700
Committer: Albert Chu <ch...@llnl.gov>
Committed: Wed May 14 10:57:51 2014 -0700
----------------------------------------------------------------------
bin/storm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/c7b22382/bin/storm
----------------------------------------------------------------------
diff --git a/bin/storm b/bin/storm
index bb6e40a..bd11432 100755
--- a/bin/storm
+++ b/bin/storm
@@ -42,7 +42,13 @@ else:
STORM_DIR = "/".join(os.path.realpath( __file__ ).split("/")[:-2])
USER_CONF_DIR = os.path.expanduser("~/.storm")
-CLUSTER_CONF_DIR = STORM_DIR + "/conf"
+STORM_CONF_DIR = os.getenv('STORM_CONF_DIR', None)
+
+if STORM_CONF_DIR == None:
+ CLUSTER_CONF_DIR = STORM_DIR + "/conf"
+else:
+ CLUSTER_CONF_DIR = STORM_CONF_DIR
+
if (not os.path.isfile(USER_CONF_DIR + "/storm.yaml")):
USER_CONF_DIR = CLUSTER_CONF_DIR
CONFIG_OPTS = []
[3/3] git commit: Update CHANGELOG and README for STORM-320
Posted by da...@apache.org.
Update CHANGELOG and README for STORM-320
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/5c82b9fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/5c82b9fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/5c82b9fe
Branch: refs/heads/master
Commit: 5c82b9fed13e889611f5c928fbb73f862bef20a1
Parents: 51a75fb
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Jun 19 16:55:12 2014 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Jun 19 16:55:12 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/5c82b9fe/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a03f46..593eb98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
## 0.9.3-incubating
* STORM-337: Expose managed spout ids publicly
+ * STORM-320: Support STORM_CONF_DIR environment variable to support
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/5c82b9fe/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 556a2c0..6722d13 100644
--- a/README.markdown
+++ b/README.markdown
@@ -144,6 +144,7 @@ under the License.
* thinker0 ([@thinker0](https://github.com/thinker0))
* Troy Ding ([@troyding](https://github.com/troyding))
* Aaron Zimmerman ([@aaronzimmerman](https://github.com/aaronzimmerman))
+* Albert Chu ([@chu11](https://github.com/chu11))
## Acknowledgements
[2/3] git commit: Merge branch 'STORM-320' of
https://github.com/chu11/incubator-storm into storm-320
Posted by da...@apache.org.
Merge branch 'STORM-320' of https://github.com/chu11/incubator-storm into storm-320
STORM-320: Support STORM_CONF_DIR environment variable to support
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/51a75fbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/51a75fbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/51a75fbb
Branch: refs/heads/master
Commit: 51a75fbb5e238e330a5fbc99360520f29b822059
Parents: 093ce72 c7b2238
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Jun 19 16:53:40 2014 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Jun 19 16:53:40 2014 -0500
----------------------------------------------------------------------
bin/storm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/51a75fbb/bin/storm
----------------------------------------------------------------------
diff --cc bin/storm
index c9885a2,bd11432..2c72679
--- a/bin/storm
+++ b/bin/storm
@@@ -35,28 -35,22 +35,34 @@@ def cygpath(x)
lines = output.split("\n")
return lines[0]
-if sys.platform == "cygwin":
- normclasspath = cygpath
-else:
- normclasspath = identity
-
+def init_storm_env():
+ global CLUSTER_CONF_DIR
+ ini_file = os.path.join(CLUSTER_CONF_DIR, 'storm_env.ini')
+ if not os.path.isfile(ini_file):
+ return
+ config = ConfigParser.ConfigParser()
+ config.optionxform = str
+ config.read(ini_file)
+ options = config.options('environment')
+ for option in options:
+ value = config.get('environment', option)
+ os.environ[option] = value
+
+normclasspath = cygpath if sys.platform == 'cygwin' else identity
STORM_DIR = "/".join(os.path.realpath( __file__ ).split("/")[:-2])
USER_CONF_DIR = os.path.expanduser("~/.storm")
- CLUSTER_CONF_DIR = STORM_DIR + "/conf"
+ STORM_CONF_DIR = os.getenv('STORM_CONF_DIR', None)
+
+ if STORM_CONF_DIR == None:
+ CLUSTER_CONF_DIR = STORM_DIR + "/conf"
+ else:
+ CLUSTER_CONF_DIR = STORM_CONF_DIR
+
if (not os.path.isfile(USER_CONF_DIR + "/storm.yaml")):
USER_CONF_DIR = CLUSTER_CONF_DIR
+
+init_storm_env()
+
CONFIG_OPTS = []
CONFFILE = ""
JAR_JVM_OPTS = shlex.split(os.getenv('STORM_JAR_JVM_OPTS', ''))