You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2017/07/26 19:48:20 UTC
[1/2] storm git commit: STORM-2659: Add daemon.name variable to
storm.cmd to fix log4j logging
Repository: storm
Updated Branches:
refs/heads/1.1.x-branch ebdde9fc2 -> 57372baf2
STORM-2659: Add daemon.name variable to storm.cmd to fix log4j logging
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f4933cb9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f4933cb9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f4933cb9
Branch: refs/heads/1.1.x-branch
Commit: f4933cb9a4d0892065bc854fd8234b28e712a11f
Parents: ebdde9f
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Tue Jul 25 22:01:04 2017 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Wed Jul 26 21:39:53 2017 +0200
----------------------------------------------------------------------
bin/storm.cmd | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f4933cb9/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index 23d65c6..32183c8 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -145,6 +145,7 @@
:drpc
set CLASS=org.apache.storm.daemon.drpc
+ set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=drpc
"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" org.apache.storm.command.config_value drpc.childopts > %CMD_TEMP_FILE%
FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -171,6 +172,7 @@
:logviewer
set CLASS=org.apache.storm.daemon.logviewer
+ set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=logviewer
"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" org.apache.storm.command.config_value logviewer.childopts > %CMD_TEMP_FILE%
FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -183,6 +185,7 @@
:nimbus
set CLASS=org.apache.storm.daemon.nimbus
+ set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=nimbus
"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" org.apache.storm.command.config_value nimbus.childopts > %CMD_TEMP_FILE%
FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -215,6 +218,7 @@
:supervisor
set CLASS=org.apache.storm.daemon.supervisor.Supervisor
+ set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=supervisor
"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" org.apache.storm.command.config_value supervisor.childopts > %CMD_TEMP_FILE%
FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
@@ -227,6 +231,7 @@
:ui
set CLASS=org.apache.storm.ui.core
+ set STORM_OPTS=%STORM_OPTS% -Ddaemon.name=ui
set CLASSPATH=%CLASSPATH%;%STORM_HOME%
"%JAVA%" -client -Dstorm.options= -Dstorm.conf.file= -cp "%CLASSPATH%" org.apache.storm.command.config_value ui.childopts > %CMD_TEMP_FILE%
FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
[2/2] storm git commit: Changelog: STORM-2659
Posted by sr...@apache.org.
Changelog: STORM-2659
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/57372baf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/57372baf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/57372baf
Branch: refs/heads/1.1.x-branch
Commit: 57372baf295f4f41b7d32e537518ee9fbc9820fd
Parents: f4933cb
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Wed Jul 26 21:46:10 2017 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Wed Jul 26 21:46:10 2017 +0200
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/57372baf/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bccac4..09b1bb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.1.1
+ * STORM-2659: Add daemon.name variable to storm.cmd to fix log4j logging
* STORM-2652: fix error in open method of JmsSpout
* STORM-2645: Update storm.py to be python3 compatible
* STORM-2621: add tuple_population metric