You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/04/25 20:49:37 UTC
[1/3] git commit: STORM-276. Add support for logviewer in storm.cmd.
Repository: incubator-storm
Updated Branches:
refs/heads/master a5cd7a523 -> 618337e2e
STORM-276. Add support for logviewer in storm.cmd.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/4375bd75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/4375bd75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/4375bd75
Branch: refs/heads/master
Commit: 4375bd758ec7a5c461aff34a040b6dc03a745974
Parents: 3cf3f55
Author: Sriharsha Chintalapani <sc...@HW10843.local>
Authored: Thu Apr 10 09:16:04 2014 -0700
Committer: Sriharsha Chintalapani <sc...@HW10843.local>
Committed: Thu Apr 10 09:16:04 2014 -0700
----------------------------------------------------------------------
bin/storm-config.cmd | 11 +----------
bin/storm.cmd | 9 +++++++--
2 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/4375bd75/bin/storm-config.cmd
----------------------------------------------------------------------
diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index ccf1d4f..71c1721 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -82,22 +82,13 @@ if not defined STORM_LOG_DIR (
set STORM_LOG_DIR=%STORM_HOME%\logs
)
-if not defined STORM_LOGFILE (
- set STORM_LOGFILE=storm.log
-)
-
-if not defined STORM_ROOT_LOGGER (
- set STORM_ROOT_LOGGER=INFO,console,DRFA
-)
-
if not defined STORM_LOGBACK_CONFIGURATION_FILE (
- set STORM_LOGBACK_CONFIGURATION_FILE=%STORM_CONF_DIR%\logback.xml
+ set STORM_LOGBACK_CONFIGURATION_FILE=%STORM_HOME%\logback\cluster.xml
)
set STORM_OPTS=-Dstorm.home=%STORM_HOME% -Djava.library.path=sbin
set STORM_OPTS=%STORM_OPTS% -Dlogback.configurationFile=%STORM_LOGBACK_CONFIGURATION_FILE%
set STORM_OPTS=%STORM_OPTS% -Dstorm.log.dir=%STORM_LOG_DIR%
-set STORM_OPTS=%STORM_OPTS% -Dstorm.root.logger=%STORM_ROOT_LOGGER%
if not defined STORM_SERVER_OPTS (
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/4375bd75/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index a656ac8..5ad84f4 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -55,7 +55,7 @@
goto :eof
)
- set corecommands=activate deactivate dev-zookeeper drpc kill list nimbus rebalance repl shell supervisor ui
+ set corecommands=activate deactivate dev-zookeeper drpc kill list nimbus logviewer rebalance repl shell supervisor ui
for %%i in ( %corecommands% ) do (
if %storm-command% == %%i set corecommand=true
)
@@ -122,6 +122,11 @@
set STORM_OPTS=%STORM_CLIENT_OPTS% %STORM_OPTS%
goto :eof
+:logviewer
+ set CLASS=backtype.storm.daemon.logviewer
+ set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
+ goto :eof
+
:nimbus
set CLASS=backtype.storm.daemon.nimbus
set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
@@ -154,7 +159,7 @@
goto :eof
:version
- type RELEASE
+ type %STORM_HOME%\RELEASE
goto :eof
:make_command_arguments
[2/3] git commit: Merge branch 'windows-storm-cmd' of
github.com:harshach/incubator-storm
Posted by pt...@apache.org.
Merge branch 'windows-storm-cmd' of github.com:harshach/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/24b715ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/24b715ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/24b715ae
Branch: refs/heads/master
Commit: 24b715ae5e771682608d1fcd3a08bdd33d8d3b11
Parents: a5cd7a5 4375bd7
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 25 14:48:40 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 25 14:48:40 2014 -0400
----------------------------------------------------------------------
bin/storm-config.cmd | 11 +----------
bin/storm.cmd | 9 +++++++--
2 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[3/3] git commit: update changelog
Posted by pt...@apache.org.
update changelog
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/618337e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/618337e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/618337e2
Branch: refs/heads/master
Commit: 618337e2e7ac59ce0ea972b013c4a9e1c32d7188
Parents: 24b715a
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 25 14:49:28 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 25 14:49:28 2014 -0400
----------------------------------------------------------------------
CHANGELOG.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/618337e2/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90de202..5520afb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 0.9.2-incubating (unreleased)
+ * STORM-276: Add support for logviewer in storm.cmd.
* STORM-286: Use URLEncoder#encode with the encoding specified.
- * STORM-296. Storm kafka unit tests are failing on windows
+ * STORM-296: Storm kafka unit tests are failing on windows
* STORM-291: upgrade http-client to 4.3.3
* STORM-252: Upgrade curator to latest version
* STORM-294: Commas not escaped in command line