From d0999f5038c796204cc048901c20c52586406507 Mon Sep 17 00:00:00 2001
From: Will Mooreston <97046018+labkey-willm@users.noreply.github.com>
Date: Tue, 9 Jul 2024 11:08:10 -0700
Subject: [PATCH] add additivity=false to prevent double logging (#843)

* add additivity=false to org.labkey.* loggers to prevent double logging

* remove additivity=false from non 'org.labkey' loggers

* additional logging refinements
---
 server/embedded/src/main/resources/log4j2.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/server/embedded/src/main/resources/log4j2.xml b/server/embedded/src/main/resources/log4j2.xml
index 64f01bca1f..ea674d04c7 100644
--- a/server/embedded/src/main/resources/log4j2.xml
+++ b/server/embedded/src/main/resources/log4j2.xml
@@ -232,11 +232,11 @@ account managers so that we can coordinate edits with other customized copies of
             <Logger name="org.labkey.api.data.Table" level="debug"/>
         -->
 
-        <Logger name="org.labkey.api.data"/>
+        <Logger name="org.labkey.api.data" />
 
-        <Logger name="org.labkey.api.dataiterator"/>
+        <Logger name="org.labkey.api.dataiterator" />
 
-        <Logger name="org.labkey.docker">
+        <Logger name="org.labkey.docker" >
             <level value="info"/>
         </Logger>
 
@@ -278,9 +278,8 @@ account managers so that we can coordinate edits with other customized copies of
             <AppenderRef ref="THREAD_DUMP"/>
         </Logger>
 
-        <Logger name="org.labkey.core.admin.AdminController.ContentSecurityPolicyReportAction"  additivity="false" level="warn">
+        <Logger name="org.labkey.core.admin.AdminController.ContentSecurityPolicyReportAction" level="warn">
             <AppenderRef ref="CSP_REPORT" />
-            <AppenderRef ref="CONSOLE"/>
         </Logger>
 
         <!--
@@ -303,7 +302,6 @@ account managers so that we can coordinate edits with other customized copies of
 
         <Logger name="org.labkey.audit.event" level="OFF">
             <AppenderRef ref="LABKEY_AUDIT"/>
-            <AppenderRef ref="CONSOLE"/>
         </Logger>
 
         <!--