Add option to configure logging filters

This commit introduces `logging.filters.console` and `logging.filters.file` properties which allow configuration of logging filters for default console and file appenders.

Author: vpavic

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -41,6 +41,8 @@ content into your application; rather pick only the properties that you need.
 	logging.config= # Location of the logging configuration file. For instance `classpath:logback.xml` for Logback
 	logging.exception-conversion-word=%wEx # Conversion word used when logging exceptions.
 	logging.file= # Log file name. For instance `myapp.log`
+	logging.filters.console= # Comma-separated list of filter classes to apply to console appender. Only supported with the default logback setup.
+	logging.filters.file= # Comma-separated list of filter classes to apply to file appender. Only supported with the default logback setup.
 	logging.level.*= # Log levels severity mapping. For instance `logging.level.org.springframework=DEBUG`
 	logging.path= # Location of the log file. For instance `/var/log`
 	logging.pattern.console= # Appender pattern for output to the console. Only supported with the default logback setup.

spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.Appender;
 import ch.qos.logback.core.ConsoleAppender;
+import ch.qos.logback.core.OutputStreamAppender;
+import ch.qos.logback.core.filter.Filter;
 import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
 import ch.qos.logback.core.rolling.RollingFileAppender;
 import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy;
@@ -41,6 +43,7 @@
  * and {@code file-appender.xml} files provided for classic {@code logback.xml} use.
  *
  * @author Phillip Webb
+ * @author Vedran Pavic
  * @since 1.1.2
  */
 class DefaultLogbackConfiguration {
@@ -55,21 +58,21 @@ class DefaultLogbackConfiguration {
 
 	private static final Charset UTF8 = Charset.forName("UTF-8");
 
-	private final PropertyResolver patterns;
+	private final PropertyResolver resolver;
 
 	private final LogFile logFile;
 
 	DefaultLogbackConfiguration(LoggingInitializationContext initializationContext,
 			LogFile logFile) {
-		this.patterns = getPatternsResolver(initializationContext.getEnvironment());
+		this.resolver = getPatternsResolver(initializationContext.getEnvironment());
 		this.logFile = logFile;
 	}
 
 	private PropertyResolver getPatternsResolver(Environment environment) {
 		if (environment == null) {
 			return new PropertySourcesPropertyResolver(null);
 		}
-		return new RelaxedPropertyResolver(environment, "logging.pattern.");
+		return new RelaxedPropertyResolver(environment, "logging.");
 	}
 
 	public void apply(LogbackConfigurator config) {
@@ -115,20 +118,29 @@ private void base(LogbackConfigurator config) {
 	private Appender<ILoggingEvent> consoleAppender(LogbackConfigurator config) {
 		ConsoleAppender<ILoggingEvent> appender = new ConsoleAppender<ILoggingEvent>();
 		PatternLayoutEncoder encoder = new PatternLayoutEncoder();
-		String logPattern = this.patterns.getProperty("console", CONSOLE_LOG_PATTERN);
+		String logPattern = this.resolver.getProperty("pattern.console",
+				CONSOLE_LOG_PATTERN);
 		encoder.setPattern(OptionHelper.substVars(logPattern, config.getContext()));
 		encoder.setCharset(UTF8);
 		config.start(encoder);
 		appender.setEncoder(encoder);
+
+		String[] filterClasses = this.resolver.getProperty("filters.console",
+				String[].class);
+		if (filterClasses != null) {
+			configureFilters(config, appender, filterClasses);
+		}
+
 		config.appender("CONSOLE", appender);
 		return appender;
 	}
 
 	private Appender<ILoggingEvent> fileAppender(LogbackConfigurator config,
 			String logFile) {
-		RollingFileAppender<ILoggingEvent> appender = new RollingFileAppender<ILoggingEvent>();
+		RollingFileAppender<ILoggingEvent> appender =
+				new RollingFileAppender<ILoggingEvent>();
 		PatternLayoutEncoder encoder = new PatternLayoutEncoder();
-		String logPattern = this.patterns.getProperty("file", FILE_LOG_PATTERN);
+		String logPattern = this.resolver.getProperty("pattern.file", FILE_LOG_PATTERN);
 		encoder.setPattern(OptionHelper.substVars(logPattern, config.getContext()));
 		appender.setEncoder(encoder);
 		config.start(encoder);
@@ -141,13 +153,36 @@ private Appender<ILoggingEvent> fileAppender(LogbackConfigurator config,
 		rollingPolicy.setParent(appender);
 		config.start(rollingPolicy);
 
-		SizeBasedTriggeringPolicy<ILoggingEvent> triggeringPolicy = new SizeBasedTriggeringPolicy<ILoggingEvent>();
+		SizeBasedTriggeringPolicy<ILoggingEvent> triggeringPolicy =
+				new SizeBasedTriggeringPolicy<ILoggingEvent>();
 		triggeringPolicy.setMaxFileSize("10MB");
 		appender.setTriggeringPolicy(triggeringPolicy);
 		config.start(triggeringPolicy);
 
+		String[] filterClasses = this.resolver.getProperty("filters.file",
+				String[].class);
+		if (filterClasses != null) {
+			configureFilters(config, appender, filterClasses);
+		}
+
 		config.appender("FILE", appender);
 		return appender;
 	}
 
+	@SuppressWarnings("unchecked")
+	private void configureFilters(LogbackConfigurator config,
+			OutputStreamAppender appender, String[] filterClasses) {
+		for (String filterClass : filterClasses) {
+			try {
+				Filter filter = (Filter) Class.forName(filterClass).newInstance();
+				config.start(filter);
+				appender.addFilter(filter);
+			}
+			catch (Exception e) {
+				throw new IllegalStateException("Unable to configure " + filterClass +
+						" logging filter");
+			}
+		}
+	}
+
 }

spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -69,6 +69,18 @@
     "description": "Name of the log file. Names can be an exact location or relative to the current directory.",
     "sourceType": "org.springframework.boot.logging.LoggingApplicationListener"
   },
+  {
+    "name": "logging.filter.console",
+    "type": "java.lang.String[]",
+    "description": "Comma-separated list of filter classes to apply to console appender. Only supported with the default logback setup.",
+    "sourceType": "org.springframework.boot.logging.LoggingApplicationListener"
+  },
+  {
+    "name": "logging.filter.file",
+    "type": "java.lang.String[]",
+    "description": "Comma-separated list of filter classes to apply to file appender. Only supported with the default logback setup.",
+    "sourceType": "org.springframework.boot.logging.LoggingApplicationListener"
+  },
   {
     "name": "logging.level",
     "type": "java.util.Map<java.lang.String,java.lang.String>",

spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java

@@ -23,7 +23,10 @@
 
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.classic.spi.LoggerContextListener;
+import ch.qos.logback.core.filter.Filter;
+import ch.qos.logback.core.spi.FilterReply;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.impl.SLF4JLogFactory;
 import org.hamcrest.Matcher;
@@ -59,6 +62,7 @@
  * @author Dave Syer
  * @author Phillip Webb
  * @author Andy Wilkinson
+ * @author Vedran Pavic
  */
 public class LogbackLoggingSystemTests extends AbstractLoggingSystemTests {
 
@@ -337,6 +341,45 @@ public void initializationIsOnlyPerformedOnceUntilCleanedUp() throws Exception {
 		verify(listener, times(2)).onReset(loggerContext);
 	}
 
+	@Test
+	public void consoleFiltersProperty() throws Exception {
+		MockEnvironment environment = new MockEnvironment();
+		environment.setProperty("logging.filters.console", HelloFilter.class.getName() +
+				"," + HiFilter.class.getName());
+		LoggingInitializationContext loggingInitializationContext =
+				new LoggingInitializationContext(environment);
+		this.loggingSystem.initialize(loggingInitializationContext, null, null);
+		this.logger.info("Hello world");
+		this.logger.info("Hi world");
+		this.logger.info("Bye world");
+		String output = this.output.toString().trim();
+		assertThat(output).doesNotContain("Hello world");
+		assertThat(output).doesNotContain("Hi world");
+		assertThat(output).contains("Bye world");
+	}
+
+	@Test
+	public void fileFiltersProperty() throws Exception {
+		MockEnvironment environment = new MockEnvironment();
+		environment.setProperty("logging.filters.file", HelloFilter.class.getName() +
+				"," + HiFilter.class.getName());
+		LoggingInitializationContext loggingInitializationContext =
+				new LoggingInitializationContext(environment);
+		this.loggingSystem.initialize(loggingInitializationContext, null,
+				getLogFile(null, tmpDir()));
+		this.logger.info("Hello world");
+		this.logger.info("Hi world");
+		this.logger.info("Bye world");
+		String output = this.output.toString().trim();
+		File file = new File(tmpDir() + "/spring.log");
+		assertThat(output).contains("Hello world");
+		assertThat(output).contains("Hi world");
+		assertThat(output).contains("Bye world");
+		assertThat(getLineWithText(file, "Hello world")).isNull();
+		assertThat(getLineWithText(file, "Hi world")).isNull();
+		assertThat(getLineWithText(file, "Bye world")).isNotEmpty();
+	}
+
 	private String getLineWithText(File file, String outputSearch) throws Exception {
 		return getLineWithText(FileCopyUtils.copyToString(new FileReader(file)),
 				outputSearch);
@@ -352,4 +395,24 @@ private String getLineWithText(String output, String outputSearch) {
 		return null;
 	}
 
+	static class HelloFilter extends Filter<ILoggingEvent> {
+
+		@Override
+		public FilterReply decide(ILoggingEvent event) {
+			return event.getMessage().contains("Hello")
+					? FilterReply.DENY : FilterReply.NEUTRAL;
+		}
+
+	}
+
+	static class HiFilter extends Filter<ILoggingEvent> {
+
+		@Override
+		public FilterReply decide(ILoggingEvent event) {
+			return event.getMessage().contains("Hi")
+					? FilterReply.DENY : FilterReply.NEUTRAL;
+		}
+
+	}
+
 }