diff --git a/common/main/java/com/couchbase/lite/internal/core/C4Log.java b/common/main/java/com/couchbase/lite/internal/core/C4Log.java index c46db7138..7ffd7956f 100644 --- a/common/main/java/com/couchbase/lite/internal/core/C4Log.java +++ b/common/main/java/com/couchbase/lite/internal/core/C4Log.java @@ -127,12 +127,21 @@ public boolean isInUse() { m.put(C4Constants.LogDomain.SQL, LogDomain.DATABASE); m.put(C4Constants.LogDomain.SYNC, LogDomain.REPLICATOR); m.put(C4Constants.LogDomain.SYNC_BUSY, LogDomain.REPLICATOR); - // m.put(C4Constants.LogDomain.TLS, LogDomain.NETWORK); + m.put(C4Constants.LogDomain.TLS, LogDomain.NETWORK); m.put(C4Constants.LogDomain.WEB_SOCKET, LogDomain.NETWORK); m.put(C4Constants.LogDomain.ZIP, LogDomain.NETWORK); LOGGING_DOMAIN_FROM_C4 = Collections.unmodifiableMap(m); } + // LiteCore domains that are mapped, but whose level is left at the LiteCore default + @NonNull + private static final Set MAPPED_ONLY_C4_LOGGING_DOMAINS; + static { + final Set s = new HashSet<>(); + s.add(C4Constants.LogDomain.TLS); + MAPPED_ONLY_C4_LOGGING_DOMAINS = Collections.unmodifiableSet(s); + } + @NonNull private static final Map> LOGGING_DOMAIN_TO_C4; private static final Set KNOWN_C4_LOGGING_DOMAINS; @@ -140,6 +149,8 @@ public boolean isInUse() { final Set s = new HashSet<>(); final Map> m = new HashMap<>(); for (Map.Entry entry: LOGGING_DOMAIN_FROM_C4.entrySet()) { + if (MAPPED_ONLY_C4_LOGGING_DOMAINS.contains(entry.getKey())) { continue; } + final LogDomain domain = entry.getValue(); Set domains = m.get(domain); diff --git a/common/test/java/com/couchbase/lite/logging/LogTest.kt b/common/test/java/com/couchbase/lite/logging/LogTest.kt index 4890874c2..f1408305a 100644 --- a/common/test/java/com/couchbase/lite/logging/LogTest.kt +++ b/common/test/java/com/couchbase/lite/logging/LogTest.kt @@ -8,6 +8,7 @@ import com.couchbase.lite.LogDomain import com.couchbase.lite.LogLevel import com.couchbase.lite.getC4Db import com.couchbase.lite.internal.QueryLanguage +import com.couchbase.lite.internal.core.C4Constants import com.couchbase.lite.internal.core.C4Log import com.couchbase.lite.internal.core.C4Query import com.couchbase.lite.internal.core.C4TestUtils @@ -42,7 +43,8 @@ private class ConsoleLogSinkDelegate : ConsoleLogSink.Delegate { private class SingleLineLogSink(private val prefix: String? = null) : BaseLogSink(LogLevel.DEBUG) { private var level: LogLevel? = null - private var domain: LogDomain? = null + var domain: LogDomain? = null + private set private var message: String? = null private var latch = CountDownLatch(1) @@ -680,6 +682,17 @@ class LogTest : BaseDbTest() { Assert.assertTrue(success) } + @Test + fun testTLSLogDomain() { + val sink = SingleLineLogSink("TLS TEST") + LogSinks.get().custom = sink + Assert.assertEquals(C4Constants.LogLevel.WARNING, C4TestUtils.getLogLevel(C4Constants.LogDomain.TLS)) + + C4TestUtils.forceLog(C4Constants.LogDomain.TLS, C4Constants.LogLevel.WARNING, "TLS TEST") + Assert.assertNotNull(sink.awaitMessage()) + Assert.assertEquals(LogDomain.NETWORK, sink.domain) + } + @Test fun testNonASCII() { val prefix = "HEBREW: "