Skip to content
Snippets Groups Projects
Commit 12d5c413 authored by Sebastian's avatar Sebastian Committed by Mikolai Gütschow
Browse files

Properly configure logging for testing executables, too

parent 6d22d4ea
No related branches found
No related tags found
1 merge request!37Bridge logging over slf4j to logback
Pipeline #8145 passed
......@@ -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 =
......
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
}
}
......@@ -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]
......
......@@ -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'" }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment