You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2019/10/25 16:39:26 UTC
svn commit: r1868946 - in /jackrabbit/oak/branches/1.4: ./
oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
Author: reschke
Date: Fri Oct 25 16:39:26 2019
New Revision: 1868946
URL: http://svn.apache.org/viewvc?rev=1868946&view=rev
Log:
OAK-7892: LogCustomizer should support slf4j log levels (merged r1846396 into 1.4)
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1846396
Modified: jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java?rev=1868946&r1=1868945&r2=1868946&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java (original)
+++ jackrabbit/oak/branches/1.4/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java Fri Oct 25 16:39:26 2019
@@ -97,11 +97,21 @@ public class LogCustomizer {
return this;
}
+ public LogCustomizerBuilder enable(org.slf4j.event.Level level) {
+ this.enableLevel = fromSlf4jLevel(level);
+ return this;
+ }
+
public LogCustomizerBuilder filter(Level level) {
this.filterLevel = level;
return this;
}
+ public LogCustomizerBuilder filter(org.slf4j.event.Level level) {
+ this.filterLevel = fromSlf4jLevel(level);
+ return this;
+ }
+
public LogCustomizerBuilder exactlyMatches(String message) {
this.matchExactMessage = message;
return this;
@@ -120,6 +130,23 @@ public class LogCustomizer {
public LogCustomizer create() {
return new LogCustomizer(name, enableLevel, filterLevel, matchExactMessage, matchContainsMessage, matchRegexMessage);
}
+
+ private static Level fromSlf4jLevel(org.slf4j.event.Level level) {
+ switch (level) {
+ case DEBUG:
+ return Level.DEBUG;
+ case ERROR:
+ return Level.ERROR;
+ case INFO:
+ return Level.INFO;
+ case TRACE:
+ return Level.TRACE;
+ case WARN:
+ return Level.WARN;
+ default:
+ throw new IllegalArgumentException("Log level not supported: " + level);
+ }
+ }
}
private final Logger logger;