From fa29b1ed5fd2721f6b674dcc8da5513b4555b745 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Wed, 10 Apr 2019 21:20:20 -0700
Subject: [PATCH] DATAGEODE-180 - Disable logger additivity.

---
 src/test/resources/java-util-logging.properties |  7 +++----
 src/test/resources/log4j2-test.xml              |  5 ++---
 src/test/resources/logback.xml                  | 10 +++++-----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/test/resources/java-util-logging.properties b/src/test/resources/java-util-logging.properties
index 011b9cb4..37ccf2c3 100644
--- a/src/test/resources/java-util-logging.properties
+++ b/src/test/resources/java-util-logging.properties
@@ -1,9 +1,8 @@
 # java.util.logging (JUL) configuration
 
-java.util.logging.MemoryHandler.level=OFF
-java.util.logging.MemoryHandler.size=1
-
 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.handlers=java.util.logging.MemoryHandler
+org.springframework.data.gemfire.support.SpringContextBootstrappingInitializer.useParentHandlers=false
diff --git a/src/test/resources/log4j2-test.xml b/src/test/resources/log4j2-test.xml
index 2463dda8..59457f75 100644
--- a/src/test/resources/log4j2-test.xml
+++ b/src/test/resources/log4j2-test.xml
@@ -11,9 +11,8 @@
 	<Loggers>
 		<Logger name="org.apache.geode" level="error"/>
 		<Logger name="org.springframework" level="error"/>
-		<Logger name="org.springframework.data.gemfire.support.SpringContextBootstrappingInitializer" level="off">
-			<AppenderRef ref="nop"/>
-		</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="error">
 			<AppenderRef ref="Console"/>
 			<!--AppenderRef ref="File" /-->
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index 6581b16f..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>
@@ -21,13 +21,13 @@
 
     <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.support.SpringContextBootstrappingInitializer" level="off">
-        <appender-ref ref="nop"/>
-    </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"/>