From 1b75d799c8609a90e98d52ccd93fd009b620fd37 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Tue, 18 Jun 2019 11:19:33 -0700
Subject: [PATCH] SGF-857 - Tune the build log output.

---
 .../resources/java-util-logging.properties    |  8 +++++++
 src/test/resources/log4j.properties           | 12 -----------
 src/test/resources/log4j2-test.xml            | 21 +++++++++++++++++++
 src/test/resources/logback.xml                | 10 +++++++--
 4 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 src/test/resources/java-util-logging.properties
 delete mode 100644 src/test/resources/log4j.properties
 create mode 100644 src/test/resources/log4j2-test.xml

diff --git a/src/test/resources/java-util-logging.properties b/src/test/resources/java-util-logging.properties
new file mode 100644
index 00000000..37ccf2c3
--- /dev/null
+++ b/src/test/resources/java-util-logging.properties
@@ -0,0 +1,8 @@
+# java.util.logging (JUL) configuration
+
+org.apache=ERROR
+org.springframework=ERROR
+org.springframework.data.gemfire.listener.adapter.ContinuousQueryListenerAdapter=OFF
+org.springframework.data.gemfire.listener.adapter.ContinuousQueryListenerAdapter.useParentHandlers=false
+org.springframework.data.gemfire.support.SpringContextBootstrappingInitializer=OFF
+org.springframework.data.gemfire.support.SpringContextBootstrappingInitializer.useParentHandlers=false
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
deleted file mode 100644
index 461e444c..00000000
--- a/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-log4j.rootCategory=WARN, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-#log4j.category.org.springframework.data.gemfire.listener=TRACE
-#log4j.category.org.springframework.data.gemfire=DEBUG
-#log4j.category.org.springframework=DEBUG
-
-# for debugging datasource initialization
-# log4j.category.test.jdbc=DEBUG
diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml
new file mode 100644
index 00000000..8ab87c1a
--- /dev/null
+++ b/src/test/resources/log4j2-test.xml
@@ -0,0 +1,21 @@
+<Configuration status="error">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</Console>
+		<File name="File" fileName="build/logs/spring-test.log">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{1.} - %msg%n"/>
+		</File>
+		<Null name="nop"/>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.apache.geode" level="error"/>
+		<Logger name="org.springframework" level="error"/>
+		<Logger name="org.springframework.data.gemfire.listener.adapter.ContinuousQueryListenerAdapter" level="off" additivity="false"/>
+		<Logger name="org.springframework.data.gemfire.support.SpringContextBootstrappingInitializer" level="off" additivity="false"/>
+		<Root level="error">
+			<AppenderRef ref="Console"/>
+			<!--AppenderRef ref="File" /-->
+		</Root>
+	</Loggers>
+</Configuration>
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index 098263de..4d64c87c 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
 
-    <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+    <statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -9,6 +9,8 @@
         </encoder>
     </appender>
 
+    <appender name="nop" class="ch.qos.logback.core.helpers.NOPAppender"/>
+
     <appender name="testAppender" class="org.springframework.data.gemfire.test.logging.slf4j.logback.TestAppender">
         <encoder>
             <pattern>TEST - %m%n</pattern>
@@ -19,10 +21,14 @@
 
     <logger name="org.springframework" level="${logback.log.level:-ERROR}"/>
 
-    <logger name="org.springframework.data.gemfire.config.annotation.support.RegionDataAccessTracingAspect" level="trace">
+    <logger name="org.springframework.data.gemfire.config.annotation.support.RegionDataAccessTracingAspect" level="trace" additivity="false">
         <appender-ref ref="testAppender"/>
     </logger>
 
+    <logger name="org.springframework.data.gemfire.listener.adapter.ContinuousQueryListenerAdapter" level="off" additivity="false"/>
+
+    <logger name="org.springframework.data.gemfire.support.SpringContextBootstrappingInitializer" level="off" additivity="false"/>
+
     <root level="${logback.log.level:-ERROR}">
         <appender-ref ref="console"/>
     </root>