diff --git a/src/main/kotlin/org/briarproject/briar/desktop/Main.kt b/src/main/kotlin/org/briarproject/briar/desktop/Main.kt index 7d0557cfab92baedce158012c76d4c4d91fa06f5..36b4aef0766198c2ccee7a75035bb4202c10f253 100644 --- a/src/main/kotlin/org/briarproject/briar/desktop/Main.kt +++ b/src/main/kotlin/org/briarproject/briar/desktop/Main.kt @@ -15,7 +15,7 @@ import org.briarproject.briar.BriarCoreEagerSingletons import org.briarproject.briar.desktop.utils.FileUtils import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18n import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18nF -import org.slf4j.bridge.SLF4JBridgeHandler +import org.briarproject.briar.desktop.utils.LogUtils import java.io.File.separator import java.io.IOException import java.lang.System.getProperty @@ -25,7 +25,6 @@ import java.nio.file.Paths import java.util.logging.Level.ALL import java.util.logging.Level.INFO import java.util.logging.Level.WARNING -import java.util.logging.LogManager private val DEFAULT_DATA_DIR = getProperty("user.home") + separator + ".briar" + separator + "desktop" @@ -64,10 +63,7 @@ private class Main : CliktCommand( else -> ALL } - SLF4JBridgeHandler.removeHandlersForRootLogger() - SLF4JBridgeHandler.install() - - LogManager.getLogManager().getLogger("").level = level + LogUtils.setupLogging(level) val dataDir = getDataDir() val app = diff --git a/src/main/kotlin/org/briarproject/briar/desktop/utils/LogUtils.kt b/src/main/kotlin/org/briarproject/briar/desktop/utils/LogUtils.kt new file mode 100644 index 0000000000000000000000000000000000000000..527a2f4f82af8beedcc5200143461cf11d505c79 --- /dev/null +++ b/src/main/kotlin/org/briarproject/briar/desktop/utils/LogUtils.kt @@ -0,0 +1,15 @@ +package org.briarproject.briar.desktop.utils + +import org.slf4j.bridge.SLF4JBridgeHandler +import java.util.logging.Level +import java.util.logging.LogManager + +object LogUtils { + + fun setupLogging(level: Level) { + SLF4JBridgeHandler.removeHandlersForRootLogger() + SLF4JBridgeHandler.install() + + LogManager.getLogManager().getLogger("").level = level + } +} diff --git a/src/test/kotlin/org/briarproject/briar/desktop/RunWithMultipleTemporaryAccounts.kt b/src/test/kotlin/org/briarproject/briar/desktop/RunWithMultipleTemporaryAccounts.kt index 2747c4277f8249375fd7647c231c034ee2e4e12d..7c927125c771b30658be792fee9a7cb2c4d172c4 100644 --- a/src/test/kotlin/org/briarproject/briar/desktop/RunWithMultipleTemporaryAccounts.kt +++ b/src/test/kotlin/org/briarproject/briar/desktop/RunWithMultipleTemporaryAccounts.kt @@ -9,8 +9,8 @@ import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT import org.briarproject.briar.BriarCoreEagerSingletons import org.briarproject.briar.desktop.TestUtils.getDataDir -import java.util.logging.Level.INFO -import java.util.logging.LogManager +import org.briarproject.briar.desktop.utils.LogUtils +import java.util.logging.Level.ALL import java.util.logging.Logger internal class RunWithMultipleTemporaryAccounts( @@ -26,7 +26,7 @@ internal class RunWithMultipleTemporaryAccounts( @OptIn(ExperimentalComposeUiApi::class) fun run() { - LogManager.getLogManager().getLogger("").level = INFO + LogUtils.setupLogging(ALL) for (i in names.indices) { val name = names[i] diff --git a/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt b/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt index f13ba8e95bfc44c8e2cac80b366495433101c21d..fc340f94ce171ab8342888823571bcf45665ef43 100644 --- a/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt +++ b/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt @@ -6,8 +6,8 @@ import mu.KotlinLogging import org.briarproject.bramble.BrambleCoreEagerSingletons import org.briarproject.briar.BriarCoreEagerSingletons import org.briarproject.briar.desktop.TestUtils.getDataDir -import java.util.logging.Level.INFO -import java.util.logging.LogManager +import org.briarproject.briar.desktop.utils.LogUtils +import java.util.logging.Level.ALL internal class RunWithTemporaryAccount(val customization: BriarDesktopTestApp.() -> Unit) { @@ -17,7 +17,7 @@ internal class RunWithTemporaryAccount(val customization: BriarDesktopTestApp.() @OptIn(ExperimentalComposeUiApi::class) fun run() { - LogManager.getLogManager().getLogger("").level = INFO + LogUtils.setupLogging(ALL) val dataDir = getDataDir() LOG.info { "Using data directory '$dataDir'" }