From 85d630c34e34a7b995fdfbfce7e783acfbc6ae66 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Fri, 7 Feb 2020 17:02:57 -0800
Subject: [PATCH] Refactor the 'spring-geode-starter-logging' module provided
 logback.xml file to use templates (includes).

Moved the declared Appenders and Loggers from logback.xml to a new logback-include.xml file making it easier to compose Logback (XML) configuration files using templates, or includes.  This is particularly useful during Integration Testing where logback-test.xml files can be composed with different templates/includes.

Resolves gh-73.
---
 .../src/main/resources/logback-include.xml       | 16 ++++++++++++++++
 .../src/main/resources/logback.xml               | 11 ++---------
 2 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 spring-geode-starter-logging/src/main/resources/logback-include.xml

diff --git a/spring-geode-starter-logging/src/main/resources/logback-include.xml b/spring-geode-starter-logging/src/main/resources/logback-include.xml
new file mode 100644
index 00000000..8f937515
--- /dev/null
+++ b/spring-geode-starter-logging/src/main/resources/logback-include.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="delegate" class="org.springframework.geode.logging.slf4j.logback.DelegatingAppender"/>
+
+	<logger name="com.gemstone.gemfire" level="${spring.boot.data.gemfire.log.level:-INFO}"/>
+	<logger name="org.apache.geode" level="${spring.boot.data.gemfire.log.level:-INFO}"/>
+	<logger name="org.jgroups" level="${spring.boot.data.gemfire.jgroups.log.level:-ERROR}"/>
+
+</included>
diff --git a/spring-geode-starter-logging/src/main/resources/logback.xml b/spring-geode-starter-logging/src/main/resources/logback.xml
index 2cb19707..e0467d6a 100644
--- a/spring-geode-starter-logging/src/main/resources/logback.xml
+++ b/spring-geode-starter-logging/src/main/resources/logback.xml
@@ -3,18 +3,11 @@
 
 	<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
 
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
-		</encoder>
-	</appender>
-
-	<logger name="com.gemstone.gemfire" level="${spring.boot.data.gemfire.log.level:-INFO}" additivity="false"/>
-	<logger name="org.apache.geode" level="${spring.boot.data.gemfire.log.level:-INFO}" additivity="false"/>
-	<logger name="org.jgroups" level="${spring.boot.data.gemfire.jgroups.log.level:-ERROR}" additivity="false"/>
+	<include resource="logback-include.xml"/>
 
 	<root level="${logback.root.log.level:-ERROR}">
 		<appender-ref ref="console"/>
+		<appender-ref ref="delegate"/>
 	</root>
 
 </configuration>