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/02/11 20:43:12 UTC
[1/2] storm git commit: Merge branch 'STORM-1519' of
https://github.com/jerrypeng/storm into STORM-1519
Repository: storm
Updated Branches:
refs/heads/1.x-branch afbbf2359 -> 5fd312153
Merge branch 'STORM-1519' of https://github.com/jerrypeng/storm into STORM-1519
STORM-1519: Storm syslog logging not confirming to RFC5426 3.1
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/63a2adb5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/63a2adb5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/63a2adb5
Branch: refs/heads/1.x-branch
Commit: 63a2adb5fb81d4d4739000d227973d9702b5046b
Parents: afbbf23
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Feb 11 13:29:14 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Feb 11 13:31:07 2016 -0600
----------------------------------------------------------------------
log4j2/cluster.xml | 2 +-
log4j2/worker.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/63a2adb5/log4j2/cluster.xml
----------------------------------------------------------------------
diff --git a/log4j2/cluster.xml b/log4j2/cluster.xml
index ca333b2..baf5d44 100644
--- a/log4j2/cluster.xml
+++ b/log4j2/cluster.xml
@@ -69,7 +69,7 @@
<Syslog name="syslog" format="RFC5424" charset="UTF-8" host="localhost" port="514"
protocol="UDP" appName="[${sys:daemon.name}]" mdcId="mdc" includeMDC="true"
facility="LOCAL5" enterpriseNumber="18060" newLine="true" exceptionPattern="%rEx{full}"
- messageId="[${sys:user.name}:S0]" id="storm" immediateFlush="false" immediateFail="true"/>
+ messageId="[${sys:user.name}:S0]" id="storm" immediateFlush="true" immediateFail="true"/>
</appenders>
<loggers>
http://git-wip-us.apache.org/repos/asf/storm/blob/63a2adb5/log4j2/worker.xml
----------------------------------------------------------------------
diff --git a/log4j2/worker.xml b/log4j2/worker.xml
index 967585b..f4988d4 100644
--- a/log4j2/worker.xml
+++ b/log4j2/worker.xml
@@ -58,7 +58,7 @@
<Syslog name="syslog" format="RFC5424" charset="UTF-8" host="localhost" port="514"
protocol="UDP" appName="[${sys:storm.id}:${sys:worker.port}]" mdcId="mdc" includeMDC="true"
facility="LOCAL5" enterpriseNumber="18060" newLine="true" exceptionPattern="%rEx{full}"
- messageId="[${sys:user.name}:${sys:logging.sensitivity}]" id="storm" immediateFail="true"/>
+ messageId="[${sys:user.name}:${sys:logging.sensitivity}]" id="storm" immediateFail="true" immediateFlush="true"/>
</appenders>
<loggers>
<root level="info"> <!-- We log everything -->
[2/2] storm git commit: Added STORM-1519 to Changelog
Posted by bo...@apache.org.
Added STORM-1519 to Changelog
Conflicts:
CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5fd31215
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5fd31215
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5fd31215
Branch: refs/heads/1.x-branch
Commit: 5fd312153e8c41014b229f72d52e2a8080988f1b
Parents: 63a2adb
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Feb 11 13:40:40 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Feb 11 13:42:13 2016 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5fd31215/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5777ab1..ca286bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1519: Storm syslog logging not confirming to RFC5426 3.1
* STORM-1533: IntegerValidator for metric consumer parallelism hint
* STORM-1534: Pick correct version of jackson-annotations jar
* STORM-1476: Filter -c options from args and add them as part of storm.options