You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/07/03 14:41:24 UTC
[06/40] storm git commit: STORM-2451: windows storm.cmd does not set
log4j2 config file correctly by default
STORM-2451: windows storm.cmd does not set log4j2 config file correctly by default
the dir from the default config is log4j2 and that should be relative to STORM_HOME, however this is check was missing
Signed-off-by: alexlehm <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2cf1a3cb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2cf1a3cb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2cf1a3cb
Branch: refs/heads/1.1.x-branch
Commit: 2cf1a3cba05a617de8454f41e343957d6be90a64
Parents: bb126ae
Author: alexlehm <al...@gmail.com>
Authored: Sun Apr 2 15:04:10 2017 +0200
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jun 29 16:25:11 2017 +0900
----------------------------------------------------------------------
bin/storm-config.cmd | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2cf1a3cb/bin/storm-config.cmd
----------------------------------------------------------------------
diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index 0a9ae5e..f5e677f 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -102,6 +102,16 @@ FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
)
@rem
+@rem if we have a dir with relative path, make it absolute
+@rem
+
+if not %STORM_LOG4J2_CONFIGURATION_DIR% == nil (
+ if exist %STORM_HOME%\%STORM_LOG4J2_CONFIGURATION_DIR% (
+ set STORM_LOG4J2_CONFIGURATION_DIR=%STORM_HOME%\%STORM_LOG4J2_CONFIGURATION_DIR%
+ )
+)
+
+@rem
@rem if STORM_LOG4J2_CONFIGURATION_DIR was defined, also set STORM_LOG4J2_CONFIGURATION_FILE
@rem