From 9240d41ed6bba1c6c5a207afd1077af5becdab86 Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Sat, 6 Jun 2020 14:29:53 -0700
Subject: [PATCH] Rename/cleanup log4j2 config

---
 deps.edn                    |  2 +-
 test/log4j2-info.properties | 28 ++++++++++++++++++++++++++++
 test/log4j2-jdbc.properties | 13 -------------
 3 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 test/log4j2-info.properties
 delete mode 100644 test/log4j2-jdbc.properties

diff --git a/deps.edn b/deps.edn
index 9e0a8ba..6cc599e 100644
--- a/deps.edn
+++ b/deps.edn
@@ -33,7 +33,7 @@
                       org.apache.logging.log4j/log4j-jcl {:mvn/version "2.13.3"}
                       org.apache.logging.log4j/log4j-jul {:mvn/version "2.13.3"}
                       org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.13.3"}}
-         :jvm-opts ["-Dlog4j2.configurationFile=log4j2-jdbc.properties"]}
+         :jvm-opts ["-Dlog4j2.configurationFile=log4j2-info.properties"]}
   :runner
   {:extra-deps {com.cognitect/test-runner
                 {:git/url "https://github.com/cognitect-labs/test-runner"
diff --git a/test/log4j2-info.properties b/test/log4j2-info.properties
new file mode 100644
index 0000000..a3bc4d3
--- /dev/null
+++ b/test/log4j2-info.properties
@@ -0,0 +1,28 @@
+# Sean's normal mode, shows INFO and above, with highlighting:
+rootLogger.level = info
+rootLogger.appenderRef.stdout.ref = STDOUT
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = [%c] %highlight{%m}%n
+
+# I do not care about any of c3p0's INFO messages...
+logger.c3p0.name = com.mchange.v2
+logger.c3p0.level = warn
+logger.c3p0.appenderRef.stdout.ref = STDOUT
+
+# ...nor HikariCP...
+logger.hikari.name = com.zaxxer.hikari
+logger.hikari.level = warn
+logger.hikari.appenderRef.stdout.ref = STDOUT
+
+# ...nor embedded HSQLDB...
+logger.hsqldb.name = hsqldb.db
+logger.hsqldb.level = warn
+logger.hsqldb.appenderRef.stdout.ref = STDOUT
+
+# ...nor embedded PostgreSQL...
+logger.postgres.name = io.zonky.test.db.postgres.embedded
+logger.postgres.level = warn
+logger.postgres.appenderRef.stdout.ref = STDOUT
diff --git a/test/log4j2-jdbc.properties b/test/log4j2-jdbc.properties
deleted file mode 100644
index a4e2406..0000000
--- a/test/log4j2-jdbc.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# Sean's normal mode, shows INFO and above, with highlighting:
-rootLogger.level = info
-rootLogger.appenderRef.stdout.ref = STDOUT
-
-appender.console.type = Console
-appender.console.name = STDOUT
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = [%c] %highlight{%m}%n
-
-# I do not care about any of c3p0's INFO messages:
-logger.c3p0.name = com.mchange.v2
-logger.c3p0.level = warn
-logger.c3p0.appenderRef.stdout.ref = STDOUT