You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/01/22 23:53:19 UTC
[1/3] storm git commit: STORM:1463 added file scehma to log4j config
files for windows env
Repository: storm
Updated Branches:
refs/heads/master b37e7629e -> 1a9b7b1da
STORM:1463 added file scehma to log4j config files for windows env
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/96372fa7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/96372fa7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/96372fa7
Branch: refs/heads/master
Commit: 96372fa7a3c5a87eef9a97acada44ea17deb9306
Parents: 3db9680
Author: Satish Duggana <sd...@hortonworks.com>
Authored: Tue Jan 12 12:50:55 2016 +0530
Committer: Satish Duggana <sd...@hortonworks.com>
Committed: Tue Jan 12 12:52:05 2016 +0530
----------------------------------------------------------------------
bin/storm-config.cmd | 4 ++--
.../src/clj/org/apache/storm/daemon/supervisor.clj | 11 +++++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/96372fa7/bin/storm-config.cmd
----------------------------------------------------------------------
diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index cb1e203..0d851f4 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -102,7 +102,7 @@ FOR /F "delims=" %%i in (%CMD_TEMP_FILE%) do (
@rem
if not %STORM_LOG4J2_CONFIGURATION_DIR% == nil (
- set STORM_LOG4J2_CONFIGURATION_FILE="file://%STORM_LOG4J2_CONFIGURATION_DIR%\cluster.xml"
+ set STORM_LOG4J2_CONFIGURATION_FILE="file:///%STORM_LOG4J2_CONFIGURATION_DIR%\cluster.xml"
)
@rem
@@ -110,7 +110,7 @@ if not %STORM_LOG4J2_CONFIGURATION_DIR% == nil (
@rem
if not defined STORM_LOG4J2_CONFIGURATION_FILE (
- set STORM_LOG4J2_CONFIGURATION_FILE="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%" org.apache.storm.command.config_value java.library.path > %CMD_TEMP_FILE%
http://git-wip-us.apache.org/repos/asf/storm/blob/96372fa7/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
index e4b44b0..63ae3ae 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
@@ -1074,6 +1074,13 @@
topology-worker-environment (if-let [env (storm-conf TOPOLOGY-ENVIRONMENT)]
(merge env {"LD_LIBRARY_PATH" jlp})
{"LD_LIBRARY_PATH" jlp})
+
+ log4j-configuration-file (str (if (.startsWith (System/getProperty "os.name") "Windows")
+ (if (.startsWith storm-log4j2-conf-dir "file:")
+ storm-log4j2-conf-dir
+ (str "file:///" storm-log4j2-conf-dir))
+ storm-log4j2-conf-dir)
+ file-path-separator "worker.xml")
command (concat
[(java-cmd) "-cp" classpath
topo-worker-logwriter-childopts
@@ -1084,7 +1091,7 @@
(str "-Dworker.id=" worker-id)
(str "-Dworker.port=" port)
(str "-Dstorm.log.dir=" storm-log-dir)
- (str "-Dlog4j.configurationFile=" storm-log4j2-conf-dir file-path-separator "worker.xml")
+ (str "-Dlog4j.configurationFile=" log4j-configuration-file)
(str "-DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector")
"org.apache.storm.LogWriter"]
[(java-cmd) "-server"]
@@ -1100,7 +1107,7 @@
(str "-Dstorm.options=" storm-options)
(str "-Dstorm.log.dir=" storm-log-dir)
(str "-Dlogging.sensitivity=" logging-sensitivity)
- (str "-Dlog4j.configurationFile=" storm-log4j2-conf-dir file-path-separator "worker.xml")
+ (str "-Dlog4j.configurationFile=" log4j-configuration-file)
(str "-DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector")
(str "-Dstorm.id=" storm-id)
(str "-Dworker.id=" worker-id)
[3/3] storm git commit: Added STORM-1463 to Changelog
Posted by bo...@apache.org.
Added STORM-1463 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1a9b7b1d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1a9b7b1d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1a9b7b1d
Branch: refs/heads/master
Commit: 1a9b7b1da099df3f8d8004c6d26d4fcdc89c0d7c
Parents: c64e7c8
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jan 22 16:47:44 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jan 22 16:47:44 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1a9b7b1d/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8610886..b959d34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
* STORM-1478: make bolts getComponentConfiguration method cleaner/simpler
## 1.0.0
+ * STORM-1463: added file scehma to log4j config files for windows env
* STORM-1485: DRPC Connectivity Issues
* STORM-1486: Fix storm-kafa documentation
* STORM-1214: add javadoc for Trident Streams and Operations
[2/3] storm git commit: Merge branch 'STORM-1463' of
https://github.com/satishd/storm into STORM-1463
Posted by bo...@apache.org.
Merge branch 'STORM-1463' of https://github.com/satishd/storm into STORM-1463
STORM-1463: added file scehma to log4j config files for windows env
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c64e7c85
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c64e7c85
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c64e7c85
Branch: refs/heads/master
Commit: c64e7c85cf5e94d36a1dbc21037de5e465b4ef44
Parents: b37e762 96372fa
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jan 22 16:45:35 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jan 22 16:45:35 2016 -0600
----------------------------------------------------------------------
bin/storm-config.cmd | 4 ++--
.../src/clj/org/apache/storm/daemon/supervisor.clj | 11 +++++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c64e7c85/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------