You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/05/21 17:27:35 UTC
[5/8] git commit: STORM-308 Add support for config_value to
{supervisor, nimbus, ui, drpc, logviewer} childopts
STORM-308 Add support for config_value to {supervisor,nimbus,ui,drpc,logviewer} childopts
Made changes such that the output of the command that fetches java.library.path is split based on newlines in outer loop and inner loop retrieves the value defined in 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/f55f766d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/f55f766d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/f55f766d
Branch: refs/heads/master
Commit: f55f766d7085a92ea4dfcf645fca10243ec92b89
Parents: d42daf5
Author: ChitturiPadma <pa...@gmail.com>
Authored: Tue May 13 16:57:40 2014 +0530
Committer: ChitturiPadma <pa...@gmail.com>
Committed: Tue May 13 16:57:40 2014 +0530
----------------------------------------------------------------------
bin/storm-config.cmd | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/f55f766d/bin/storm-config.cmd
----------------------------------------------------------------------
diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index 184ba35..9a11c34 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -87,16 +87,20 @@ if not defined STORM_LOGBACK_CONFIGURATION_FILE (
)
%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value java.library.path > temp.txt
-FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
- if %%i == VALUE: (
- set JAVA_LIBRARY_PATH=%%j )
+FOR /F "delims=" %%i in (temp.txt) do (
+ FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
+ if %%a == VALUE: (
+ set JAVA_LIBRARY_PATH=%%b
+ goto :storm_opts)
+ )
)
-del /F temp.txt
-set STORM_OPTS=-Dstorm.options= -Dstorm.home=%STORM_HOME% -Djava.library.path=%JAVA_LIBRARY_PATH%
-set STORM_OPTS=%STORM_OPTS% -Dlogback.configurationFile=%STORM_LOGBACK_CONFIGURATION_FILE%
-set STORM_OPTS=%STORM_OPTS% -Dstorm.log.dir=%STORM_LOG_DIR%
+:storm_opts
+ set STORM_OPTS=-Dstorm.options= -Dstorm.home=%STORM_HOME% -Djava.library.path=%JAVA_LIBRARY_PATH%
+ set STORM_OPTS=%STORM_OPTS% -Dlogback.configurationFile=%STORM_LOGBACK_CONFIGURATION_FILE%
+ set STORM_OPTS=%STORM_OPTS% -Dstorm.log.dir=%STORM_LOG_DIR%
+ del /F temp.txt
if not defined STORM_SERVER_OPTS (