Logging fixes.

We were missing some logs because of how setLogging worked.
prdoyle · Feb 8, 2024 · 9aee832 · 9aee832
1 parent 471b7f6
commit 9aee832
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/bosk-mongo/src/main/java/io/vena/bosk/drivers/mongo/MainDriver.java b/bosk-mongo/src/main/java/io/vena/bosk/drivers/mongo/MainDriver.java
@@ -235,6 +235,7 @@ private R callDownstreamInitialRoot(Type rootType) {
 	 */
 	private void refurbishTransaction() throws IOException {
 		collection.ensureTransactionStarted();
+		LOGGER.debug("Refurbishing to {}", driverSettings.preferredDatabaseFormat());
 		try {
 			// Design note: this operation shouldn't do any special coordination with
 			// the receiver/listener system, because other replicas won't.

diff --git a/bosk-mongo/src/test/java/io/vena/bosk/drivers/mongo/AbstractMongoDriverTest.java b/bosk-mongo/src/test/java/io/vena/bosk/drivers/mongo/AbstractMongoDriverTest.java
@@ -88,6 +88,15 @@ void runTearDown(TestInfo testInfo) {
 	// We'd like to use SLF4J's "Level" but that doesn't support OFF
 	public void setLogging(Level level, Logger logger) {
 		ch.qos.logback.classic.Logger logbackLogger = (ch.qos.logback.classic.Logger) logger;
+		if (Level.DEBUG.isGreaterOrEqual(logbackLogger.getEffectiveLevel())) {
+			// Note: in logback, a "greater" level is less verbose. So if DEBUG is greater or equal to
+			// the current effective level, it means the user has asked for DEBUG logs (or more),
+			// assuming the logback.xml settings specify INFO by default.
+			if (!ALREADY_WARNED.getAndSet(true)) {
+				LOGGER.warn("Logging level is {}; ignoring the recommended setting from the testcase itself", logbackLogger.getEffectiveLevel());
+			}
+			return;
+		}
 		Level originalLevel = logbackLogger.getLevel();
 		if (originalLevel == null) {
 			tearDownActions.addFirst(()->logbackLogger.setLevel(originalLevel));
@@ -170,6 +179,9 @@ public interface Refs {
 		@ReferencePath("/values/string") Reference<String> valuesString();
 	}
 
+	/**
+	 * One warning that we're ignoring logging settings from the testcase is enough.
+	 */
 	private static final AtomicBoolean ALREADY_WARNED = new AtomicBoolean(false);
 	private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMongoDriverTest.class);
 }
diff --git a/bosk-mongo/src/test/java/io/vena/bosk/drivers/mongo/SchemaEvolutionTest.java b/bosk-mongo/src/test/java/io/vena/bosk/drivers/mongo/SchemaEvolutionTest.java
@@ -111,7 +111,7 @@ void pairwise_readCompatible() throws Exception {
 
 	@ParametersByName(singleInvocationIndex = 5)
 	void pairwise_writeCompatible() throws Exception {
-		fromHelper.setLogging(Level.ERROR, SequoiaFormatDriver.class, PandoFormatDriver.class);
+		fromHelper.setLogging(Level.ERROR, SequoiaFormatDriver.class, PandoFormatDriver.class, ChangeReceiver.class);
 
 		LOGGER.debug("Create fromBosk [{}]", fromHelper.name);
 		Bosk<TestEntity> fromBosk = newBosk(fromHelper);