Repository: storm Updated Branches: refs/heads/1.0.x-branch d15b6726f -> 1121aac8e
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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1121aac8 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1121aac8 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1121aac8 Branch: refs/heads/1.0.x-branch Commit: 1121aac8e19051ab847c0583b3e7526bc9176ce2 Parents: d15b672 Author: alexlehm <[email protected]> Authored: Sun Apr 2 15:04:10 2017 +0200 Committer: Stig Rohde Døssing <[email protected]> Committed: Sat Sep 9 20:10:55 2017 +0200 ---------------------------------------------------------------------- bin/storm-config.cmd | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/1121aac8/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
