From 1292564bf1aa611757221eaa5a4a2e58aa428539 Mon Sep 17 00:00:00 2001
From: corubba <corubba@gmx.de>
Date: Sun, 17 Apr 2022 21:03:29 +0200
Subject: [PATCH] Remove duplicate log output

Appenders in logback are additive [0], specifying them multiple times
leads to log lines being output multiple times. It is usually enough to
set the appender on the root logger, and nowhere else.
Setting the same log level on multiple package levels is also kind of
unneeded, the top-most one would be enough; but not touching that here.

[0] https://logback.qos.ch/manual/configuration.html#cumulative
---
 build/docker/api/logback.xml                  | 22 +++++--------------
 modules/api/src/main/resources/logback.xml    | 14 +++---------
 .../api/src/main/resources/test/logback.xml   | 14 +++---------
 modules/core/src/test/resources/logback.xml   |  8 ++-----
 quickstart/docker-compose.yml                 |  2 ++
 5 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/build/docker/api/logback.xml b/build/docker/api/logback.xml
index 3be89973b..60a9a4278 100644
--- a/build/docker/api/logback.xml
+++ b/build/docker/api/logback.xml
@@ -7,25 +7,13 @@
         </encoder>
     </appender>
 
-    <logger name="org.flywaydb" level="DEBUG">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
+    <logger name="org.flywaydb" level="DEBUG"/>
+    <logger name="org.flywaydb.core.internal.dbsupport.SqlScript" level="DEBUG"/>
+    <logger name="org.flywaydb.core.internal.command.DbMigrate" level="DEBUG"/>
 
-    <logger name="org.flywaydb.core.internal.dbsupport.SqlScript" level="DEBUG">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
+    <logger name="vinyldns.core.route.Monitor" level="OFF"/>
 
-    <logger name="org.flywaydb.core.internal.command.DbMigrate" level="DEBUG">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
-
-    <logger name="vinyldns.core.route.Monitor" level="OFF">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
-
-    <logger name="scalikejdbc.StatementExecutor$$anon$1" level="OFF">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
+    <logger name="scalikejdbc.StatementExecutor$$anon$1" level="OFF"/>
 
     <root level="INFO">
         <appender-ref ref="CONSOLE"/>
diff --git a/modules/api/src/main/resources/logback.xml b/modules/api/src/main/resources/logback.xml
index b69706fe9..da16f38f2 100644
--- a/modules/api/src/main/resources/logback.xml
+++ b/modules/api/src/main/resources/logback.xml
@@ -7,17 +7,9 @@
         </encoder>
     </appender>
 
-    <logger name="org.flywaydb" level="DEBUG">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
-
-    <logger name="org.flywaydb.core.internal.dbsupport.SqlScript" level="DEBUG">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
-
-    <logger name="org.flywaydb.core.internal.command.DbMigrate" level="DEBUG">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
+    <logger name="org.flywaydb" level="DEBUG"/>
+    <logger name="org.flywaydb.core.internal.dbsupport.SqlScript" level="DEBUG"/>
+    <logger name="org.flywaydb.core.internal.command.DbMigrate" level="DEBUG"/>
 
     <root level="INFO">
         <appender-ref ref="CONSOLE"/>
diff --git a/modules/api/src/main/resources/test/logback.xml b/modules/api/src/main/resources/test/logback.xml
index b69706fe9..da16f38f2 100644
--- a/modules/api/src/main/resources/test/logback.xml
+++ b/modules/api/src/main/resources/test/logback.xml
@@ -7,17 +7,9 @@
         </encoder>
     </appender>
 
-    <logger name="org.flywaydb" level="DEBUG">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
-
-    <logger name="org.flywaydb.core.internal.dbsupport.SqlScript" level="DEBUG">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
-
-    <logger name="org.flywaydb.core.internal.command.DbMigrate" level="DEBUG">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
+    <logger name="org.flywaydb" level="DEBUG"/>
+    <logger name="org.flywaydb.core.internal.dbsupport.SqlScript" level="DEBUG"/>
+    <logger name="org.flywaydb.core.internal.command.DbMigrate" level="DEBUG"/>
 
     <root level="INFO">
         <appender-ref ref="CONSOLE"/>
diff --git a/modules/core/src/test/resources/logback.xml b/modules/core/src/test/resources/logback.xml
index e9d3d6772..adbddc8ca 100644
--- a/modules/core/src/test/resources/logback.xml
+++ b/modules/core/src/test/resources/logback.xml
@@ -7,13 +7,9 @@
         </encoder>
     </appender>
 
-    <logger name="org.flywaydb" level="INFO">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
+    <logger name="org.flywaydb" level="INFO"/>
 
-    <logger name="vinyldns.core.route.Monitor" level="OFF">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
+    <logger name="vinyldns.core.route.Monitor" level="OFF"/>
 
     <root level="OFF">
         <appender-ref ref="CONSOLE"/>
diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml
index 86aa4ea4b..c7f05dd00 100644
--- a/quickstart/docker-compose.yml
+++ b/quickstart/docker-compose.yml
@@ -40,6 +40,7 @@ services:
         DOCKER_FILE_PATH: "build/docker/api"
     volumes:
       - ../build/docker/api/application.conf:/opt/vinyldns/conf/application.conf
+      - ../build/docker/api/logback.xml:/opt/vinyldns/conf/logback.xml
     env_file:
       - .env
     ports:
@@ -64,6 +65,7 @@ services:
       - "${PORTAL_PORT}:${PORTAL_PORT}"
     volumes:
       - ../build/docker/portal/application.conf:/opt/vinyldns/conf/application.conf
+      - ../build/docker/portal/logback.xml:/opt/vinyldns/conf/logback.xml
     depends_on:
       - ldap