storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [1/3] storm git commit: STORM-1134. Windows: Fix log4j config.
Date Fri, 06 Nov 2015 20:56:48 GMT
Repository: storm
Updated Branches:
  refs/heads/master ed572d2a9 -> 2ef095e2b


STORM-1134. Windows: Fix log4j config.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cc53fe7c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cc53fe7c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cc53fe7c

Branch: refs/heads/master
Commit: cc53fe7cad65d420ce2992af4a2686e09532dcb7
Parents: d5e8cff
Author: Sriharsha Chintalapani <mail@harsha.io>
Authored: Tue Oct 27 08:45:42 2015 -0700
Committer: Sriharsha Chintalapani <mail@harsha.io>
Committed: Tue Oct 27 08:45:42 2015 -0700

----------------------------------------------------------------------
 bin/storm-config.cmd | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/cc53fe7c/bin/storm-config.cmd
----------------------------------------------------------------------
diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index b839160..d259e30 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -87,7 +87,7 @@ if not defined STORM_LOG_DIR (
 @rem
 
 "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value
storm.log4j2.conf.dir > %CMD_TEMP_FILE%
-  
+
 FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
 	FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
 		if %%a == VALUE: (
@@ -95,22 +95,22 @@ FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
 			del /F %CMD_TEMP_FILE%)
 		)
 	)
-)		
+)
 
 @rem
 @rem if STORM_LOG4J2_CONFIGURATION_DIR was defined, also set STORM_LOG4J2_CONFIGURATION_FILE
 @rem
 
 if not %STORM_LOG4J2_CONFIGURATION_DIR% == nil (
-	set STORM_LOG4J2_CONFIGURATION_FILE=%STORM_LOG4J2_CONFIGURATION_DIR%\cluster.xml
-) 
+	set STORM_LOG4J2_CONFIGURATION_FILE="file://%STORM_LOG4J2_CONFIGURATION_DIR%\cluster.xml"
+)
 
 @rem
 @rem otherwise, fall back to default
 @rem
 
 if not defined STORM_LOG4J2_CONFIGURATION_FILE (
-  set STORM_LOG4J2_CONFIGURATION_FILE=%STORM_HOME%\log4j2\cluster.xml
+  set STORM_LOG4J2_CONFIGURATION_FILE="file://%STORM_HOME%\log4j2\cluster.xml"
 )
 
 "%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" backtype.storm.command.config_value
java.library.path > %CMD_TEMP_FILE%


Mime
View raw message