From 354031fda2e823c5e71d14e39a7dfff7752cffc2 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Wed, 6 Jul 2022 14:23:12 -0700
Subject: [PATCH] Refactor and encapsulate Properties, Logger and Appender
 SLF4J Logback configuration (metadata) in separate includes (XML files) on
 the application classpath.

Resolves #117.
---
 .../slf4j/logback/appender-include.xml        | 24 +++++++++++++++++++
 .../logging/slf4j/logback/logger-include.xml  | 16 +++++++++++++
 .../slf4j/logback/properties-include.xml      |  9 +++++++
 3 files changed, 49 insertions(+)
 create mode 100644 spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/appender-include.xml
 create mode 100644 spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/logger-include.xml
 create mode 100644 spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/properties-include.xml

diff --git a/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/appender-include.xml b/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/appender-include.xml
new file mode 100644
index 00000000..070a1f73
--- /dev/null
+++ b/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/appender-include.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+
+	<if condition='property("bootPresent").equals("false")'>
+		<then>
+			<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+				<encoder>
+					<charset>${SPRING_BOOT_LOG_CHARSET}</charset>
+					<pattern>${SPRING_BOOT_LOG_PATTERN}</pattern>
+				</encoder>
+			</appender>
+		</then>
+	</if>
+
+	<appender name="delegate" class="org.springframework.geode.logging.slf4j.logback.DelegatingAppender"/>
+
+	<appender name="geode" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<charset>${APACHE_GEODE_LOG_CHARSET}</charset>
+			<pattern>${APACHE_GEODE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+</included>
diff --git a/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/logger-include.xml b/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/logger-include.xml
new file mode 100644
index 00000000..b96e013b
--- /dev/null
+++ b/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/logger-include.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+
+	<logger name="com.gemstone.gemfire" level="${spring.boot.data.gemfire.log.level:-INFO}" additivity="false">
+		<appender-ref ref="${spring.geode.logging.appender-ref:-CONSOLE}"/>
+	</logger>
+
+	<logger name="org.apache.geode" level="${spring.boot.data.gemfire.log.level:-INFO}" additivity="false">
+		<appender-ref ref="${spring.geode.logging.appender-ref:-CONSOLE}"/>
+	</logger>
+
+	<logger name="org.jgroups" level="${spring.boot.data.gemfire.jgroups.log.level:-WARN}" additivity="false">
+		<appender-ref ref="${spring.geode.logging.appender-ref:-CONSOLE}"/>
+	</logger>
+
+</included>
diff --git a/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/properties-include.xml b/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/properties-include.xml
new file mode 100644
index 00000000..fec6cadd
--- /dev/null
+++ b/spring-geode-project/spring-geode-starters/spring-geode-starter-logging/src/main/resources/org/springframework/geode/logging/slf4j/logback/properties-include.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+
+	<property name="SPRING_BOOT_LOG_CHARSET" value="${SPRING_BOOT_LOG_CHARSET:-${file.encoding:-UTF-8}}"/>
+	<property name="SPRING_BOOT_LOG_PATTERN" value="${SPRING_BOOT_LOG_PATTERN:-%d %5p %40.40c:%4L - %msg%n}"/>
+	<property name="APACHE_GEODE_LOG_CHARSET" value="${APACHE_GEODE_LOG_CHARSET:-${file.encoding:-UTF-8}}"/>
+	<property name="APACHE_GEODE_LOG_PATTERN" value="${APACHE_GEODE_LOG_PATTERN:-[%level{lowerCase=true} %date{yyyy/MM/dd HH:mm:ss.SSS z} &lt;%thread&gt;] %message%n%throwable%n}"/>
+
+</included>