diff --git a/common/source/java/ch/systemsx/cisd/common/logging/BufferedAppender.java b/common/source/java/ch/systemsx/cisd/common/logging/BufferedAppender.java index 10716cd47c14dcb1d9bcb92a5f97a8911367825f..0719164bd8d41c63bd900f5ddd2cc7a216aeaf9b 100644 --- a/common/source/java/ch/systemsx/cisd/common/logging/BufferedAppender.java +++ b/common/source/java/ch/systemsx/cisd/common/logging/BufferedAppender.java @@ -67,23 +67,22 @@ public final class BufferedAppender extends WriterAppender } /** - * Creates an instance for specified optional pattern, log level and optional class onto which - * log entries are filtered. + * Creates an instance for specified optional pattern, log level and snippet of the logger name + * onto which log entries are filtered. */ public BufferedAppender(final String patternOrNull, final Level logLevel, - final Class<?> classToFilterOnOrNull) + final String loggerNameSnippetToFilterOnOrNull) { logRecorder = new ByteArrayOutputStream(); - if (classToFilterOnOrNull != null) + if (loggerNameSnippetToFilterOnOrNull != null) { this.addFilter(new Filter() { - String className = classToFilterOnOrNull.getSimpleName(); - @Override public int decide(LoggingEvent event) { - return event.getLoggerName().endsWith(className) ? Filter.ACCEPT + String loggerName = event.getLoggerName(); + return loggerName.indexOf(loggerNameSnippetToFilterOnOrNull) >= 0 ? Filter.ACCEPT : Filter.DENY; } }); diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManagerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManagerTest.java index 31d562f244a59d99e371a82a44a7e2e99a9f7cc3..bf5e43f45111cf5941012350ea8247f611ea40f6 100644 --- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManagerTest.java +++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManagerTest.java @@ -58,7 +58,7 @@ public class ShareIdManagerTest extends AssertJUnit { level = Logger.getRootLogger().getLevel(); Logger.getRootLogger().setLevel(Level.DEBUG); - logRecorder = new BufferedAppender("%-5p %c - %m%n", Level.DEBUG, ShareIdManager.class); + logRecorder = new BufferedAppender("%-5p %c - %m%n", Level.DEBUG, ShareIdManager.class.getSimpleName()); context = new Mockery(); service = context.mock(IEncapsulatedOpenBISService.class); context.checking(new Expectations()