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:27 UTC
[08/13] brooklyn-server git commit: Re-use pattern layout from
logback-appender-stdout.xml
Re-use pattern layout from logback-appender-stdout.xml
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/661e40fc
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/661e40fc
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/661e40fc
Branch: refs/heads/master
Commit: 661e40fc18805b975cd46f8e4e3b3d97b12258c6
Parents: df73520
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Fri Jan 26 17:53:59 2018 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Fri Feb 9 21:09:20 2018 +0000
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/test/LogWatcher.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/661e40fc/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 176b295..aa8aa0b 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
@@ -33,6 +33,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiPredicate;
+import java.util.regex.Pattern;
import org.apache.brooklyn.util.time.Time;
import org.slf4j.Logger;
@@ -51,6 +52,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.Appender;
import ch.qos.logback.core.ConsoleAppender;
import ch.qos.logback.core.OutputStreamAppender;
@@ -195,7 +197,13 @@ public class LogWatcher implements Closeable {
}
};
- ple.setPattern(">>>> %d{ISO8601} %X{entity.ids} %-5.5p %3X{bundle.id} %c{1.} [%.16t] %m%n");
+ // The code below makes the assumption that the (test) logger configuration has a console appender
+ // for root, with a pattern layout encoder, and re-uses its encoder pattern.
+ // This is (at time of writing) as defined in logback-appender-stdout.xml.
+ final Appender<ILoggingEvent> appender = lc.getLogger("ROOT").getAppender("STDOUT");
+ final ConsoleAppender stdout = ConsoleAppender.class.cast(appender);
+ final PatternLayoutEncoder stdoutEncoder = PatternLayoutEncoder.class.cast(stdout.getEncoder());
+ ple.setPattern(stdoutEncoder.getPattern());
ple.setContext(lc);
ple.start();