You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2018/02/15 10:49:26 UTC
[07/13] brooklyn-server git commit: Use ConsoleAppender in LogWatcher
Use ConsoleAppender in LogWatcher
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/df735204
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/df735204
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/df735204
Branch: refs/heads/master
Commit: df7352048051721952a9f082f1df31b7bc8c54b2
Parents: 643aa9c
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Fri Jan 26 17:41:02 2018 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Fri Feb 9 21:09:20 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/brooklyn/test/LogWatcher.java | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/df735204/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java
----------------------------------------------------------------------
diff --git a/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java b/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java
index 16d27b0..176b295 100644
--- a/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java
+++ b/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java
@@ -51,6 +51,7 @@ import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.classic.spi.IThrowableProxy;
import ch.qos.logback.classic.spi.StackTraceElementProxy;
+import ch.qos.logback.core.ConsoleAppender;
import ch.qos.logback.core.OutputStreamAppender;
/**
@@ -155,7 +156,7 @@ public class LogWatcher implements Closeable {
private final List<ILoggingEvent> events = Collections.synchronizedList(Lists.<ILoggingEvent>newLinkedList());
private final AtomicBoolean closed = new AtomicBoolean();
private final ch.qos.logback.classic.Level loggerLevel;
- private final OutputStreamAppender<ILoggingEvent> appender;
+ private final ConsoleAppender<ILoggingEvent> appender;
private final List<ch.qos.logback.classic.Logger> watchedLoggers = Lists.newArrayList();
private volatile Map<ch.qos.logback.classic.Logger, Level> origLevels = Maps.newLinkedHashMap();
@@ -169,14 +170,7 @@ public class LogWatcher implements Closeable {
this.loggerLevel = checkNotNull(loggerLevel, "loggerLevel");
LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
- this.appender = new OutputStreamAppender<ILoggingEvent>() {
- @Override
- protected void append(ILoggingEvent event) {
- super.append(event);
-
- LOG.trace("level="+event.getLevel()+"; event="+event+"; msg="+event.getFormattedMessage());
- }
- };
+ this.appender = new ConsoleAppender<>();
PatternLayoutEncoder ple = new PatternLayoutEncoder() {
@Override
@@ -195,6 +189,7 @@ public class LogWatcher implements Closeable {
if (event != null && filter.apply(formatted)) {
events.add(formatted);
}
+ LOG.trace("level="+event.getLevel()+"; event="+event+"; msg="+event.getFormattedMessage());
super.doEncode(event);
}
@@ -206,7 +201,6 @@ public class LogWatcher implements Closeable {
this.appender.setContext(lc);
this.appender.setEncoder(ple);
- this.appender.setOutputStream(System.out);
this.appender.start();
for (String loggerName : loggerNames) {