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/03/22 20:26:32 UTC
[1/2] storm git commit: Merge branch 'metricsFile' of
https://github.com/DigitalPebble/storm into STORM-584
Repository: storm
Updated Branches:
refs/heads/1.x-branch 1aa73aba1 -> dcaa9edfb
Merge branch 'metricsFile' of https://github.com/DigitalPebble/storm into STORM-584
STORM-584: Fix logging for LoggingMetricsConsumer metrics.log file
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8bcd4b40
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8bcd4b40
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8bcd4b40
Branch: refs/heads/1.x-branch
Commit: 8bcd4b40a7620f57ef18d6a1cd71ce29ff259021
Parents: 1aa73ab
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Mar 22 14:14:14 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Mar 22 14:16:05 2016 -0500
----------------------------------------------------------------------
log4j2/cluster.xml | 15 ---------------
log4j2/worker.xml | 15 +++++++++++++++
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8bcd4b40/log4j2/cluster.xml
----------------------------------------------------------------------
diff --git a/log4j2/cluster.xml b/log4j2/cluster.xml
index baf5d44..eddfae7 100644
--- a/log4j2/cluster.xml
+++ b/log4j2/cluster.xml
@@ -19,7 +19,6 @@
<configuration monitorInterval="60">
<properties>
<property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} [%p] %msg%n</property>
- <property name="patternMetrics">%d %-8r %m%n</property>
</properties>
<appenders>
<RollingFile name="A1" immediateFlush="false"
@@ -55,17 +54,6 @@
</Policies>
<DefaultRolloverStrategy max="9"/>
</RollingFile>
- <RollingFile name="METRICS" immediateFlush="false"
- fileName="${sys:storm.log.dir}/metrics.log"
- filePattern="${sys:storm.log.dir}/metrics.log.%i.gz">
- <PatternLayout>
- <pattern>${patternMetrics}</pattern>
- </PatternLayout>
- <Policies>
- <SizeBasedTriggeringPolicy size="2 MB"/> <!-- Or every 100 MB -->
- </Policies>
- <DefaultRolloverStrategy max="9"/>
- </RollingFile>
<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}"
@@ -81,9 +69,6 @@
<AppenderRef ref="THRIFT-ACCESS"/>
<AppenderRef ref="syslog"/>
</Logger>
- <Logger name="org.apache.storm.metric.LoggingMetricsConsumer" level="info">
- <AppenderRef ref="METRICS"/>
- </Logger>
<root level="info"> <!-- We log everything -->
<appender-ref ref="A1"/>
<appender-ref ref="syslog"/>
http://git-wip-us.apache.org/repos/asf/storm/blob/8bcd4b40/log4j2/worker.xml
----------------------------------------------------------------------
diff --git a/log4j2/worker.xml b/log4j2/worker.xml
index f4988d4..630132a 100644
--- a/log4j2/worker.xml
+++ b/log4j2/worker.xml
@@ -20,6 +20,7 @@
<properties>
<property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} [%p] %msg%n</property>
<property name="patternNoTime">%msg%n</property>
+ <property name="patternMetrics">%d %-8r %m%n</property>
</properties>
<appenders>
<RollingFile name="A1"
@@ -55,6 +56,17 @@
</Policies>
<DefaultRolloverStrategy max="4"/>
</RollingFile>
+ <RollingFile name="METRICS"
+ fileName="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.metrics"
+ filePattern="${sys:workers.artifacts}/${sys:storm.id}/${sys:worker.port}/${sys:logfile.name}.metrics.%i.gz">
+ <PatternLayout>
+ <pattern>${patternMetrics}</pattern>
+ </PatternLayout>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="2 MB"/>
+ </Policies>
+ <DefaultRolloverStrategy max="9"/>
+ </RollingFile>
<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}"
@@ -65,6 +77,9 @@
<appender-ref ref="A1"/>
<appender-ref ref="syslog"/>
</root>
+ <Logger name="backtype.storm.metric.LoggingMetricsConsumer" level="info" additivity="false">
+ <appender-ref ref="METRICS"/>
+ </Logger>
<Logger name="STDERR" level="INFO">
<appender-ref ref="STDERR"/>
<appender-ref ref="syslog"/>
[2/2] storm git commit: Added STORM-584 to Changelog
Posted by bo...@apache.org.
Added STORM-584 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dcaa9edf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dcaa9edf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dcaa9edf
Branch: refs/heads/1.x-branch
Commit: dcaa9edfb4893825a2217e3a10160f4dcafb1d80
Parents: 8bcd4b4
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Mar 22 14:15:24 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Mar 22 14:16:18 2016 -0500
----------------------------------------------------------------------
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/dcaa9edf/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddaa8fe..7b83deb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -301,7 +301,7 @@
* STORM-1217: making small fixes in RAS
## 0.10.1
-
+ * STORM-584: Fix logging for LoggingMetricsConsumer metrics.log file
* STORM-1596: Do not use single Kerberos TGT instance between multiple threads
* STORM-1481: avoid Math.abs(Integer) get a negative value
* STORM-1121: Deprecate test only configuraton nimbus.reassign