From a4eb5b73e380aca280787f75c1644addc5dd9d5c Mon Sep 17 00:00:00 2001
From: ialokim <ialokim@mailbox.org>
Date: Wed, 5 Oct 2022 16:36:01 +0200
Subject: [PATCH] fix typos in KLoggerUtil, install UncaughtExceptionHandler
fixes #378
fixes #368
---
.../main/kotlin/org/briarproject/briar/desktop/Main.kt | 5 +++++
.../org/briarproject/briar/desktop/utils/KLoggerUtils.kt | 8 ++++----
.../briar/desktop/RunWithMultipleTemporaryAccounts.kt | 5 +++++
.../briarproject/briar/desktop/RunWithTemporaryAccount.kt | 5 +++++
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/Main.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/Main.kt
index 1adf2da693..7435413515 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/Main.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/Main.kt
@@ -35,6 +35,7 @@ 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.briarproject.briar.desktop.utils.KLoggerUtils.i
+import org.briarproject.briar.desktop.utils.KLoggerUtils.w
import org.briarproject.briar.desktop.utils.LogUtils
import org.jetbrains.annotations.NonNls
import java.io.File.separator
@@ -119,6 +120,10 @@ private class Main : CliktCommand(
BrambleCoreEagerSingletons.Helper.injectEagerSingletons(app)
BriarCoreEagerSingletons.Helper.injectEagerSingletons(app)
+ Thread.setDefaultUncaughtExceptionHandler { t, e ->
+ LOG.w(e) { "Uncaught exception in thread ${t.name}" }
+ }
+
application {
app.getBriarUi().start {
app.getBriarUi().stop()
diff --git a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/KLoggerUtils.kt b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/KLoggerUtils.kt
index 6fab94de0f..070c64bc0b 100644
--- a/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/KLoggerUtils.kt
+++ b/briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/utils/KLoggerUtils.kt
@@ -55,18 +55,18 @@ object KLoggerUtils {
}
fun KLogger.d(t: Throwable?, @NonNls msg: () -> Any?) {
- trace(t, msg)
+ debug(t, msg)
}
fun KLogger.i(t: Throwable?, @NonNls msg: () -> Any?) {
- trace(t, msg)
+ info(t, msg)
}
fun KLogger.w(t: Throwable?, @NonNls msg: () -> Any?) {
- trace(t, msg)
+ warn(t, msg)
}
fun KLogger.e(t: Throwable?, @NonNls msg: () -> Any?) {
- trace(t, msg)
+ error(t, msg)
}
}
diff --git a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithMultipleTemporaryAccounts.kt b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithMultipleTemporaryAccounts.kt
index 7f79c397bb..bd3e2c4f2c 100644
--- a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithMultipleTemporaryAccounts.kt
+++ b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithMultipleTemporaryAccounts.kt
@@ -30,6 +30,7 @@ import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT
import org.briarproject.briar.BriarCoreEagerSingletons
import org.briarproject.briar.desktop.TestUtils.getDataDir
import org.briarproject.briar.desktop.utils.KLoggerUtils.i
+import org.briarproject.briar.desktop.utils.KLoggerUtils.w
import org.briarproject.briar.desktop.utils.LogUtils
import org.jetbrains.annotations.NonNls
import java.util.logging.Level.ALL
@@ -94,6 +95,10 @@ internal class RunWithMultipleTemporaryAccounts(
BrambleCoreEagerSingletons.Helper.injectEagerSingletons(app)
BriarCoreEagerSingletons.Helper.injectEagerSingletons(app)
+ Thread.setDefaultUncaughtExceptionHandler { t, e ->
+ LOG.w(e) { "Uncaught exception in thread ${t.name}" }
+ }
+
val accountManager = app.getAccountManager()
@NonNls
diff --git a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
index 7ed82ca1b0..e857db65d0 100644
--- a/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
+++ b/briar-desktop/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
@@ -27,6 +27,7 @@ import org.briarproject.bramble.BrambleCoreEagerSingletons
import org.briarproject.briar.BriarCoreEagerSingletons
import org.briarproject.briar.desktop.TestUtils.getDataDir
import org.briarproject.briar.desktop.utils.KLoggerUtils.i
+import org.briarproject.briar.desktop.utils.KLoggerUtils.w
import org.briarproject.briar.desktop.utils.LogUtils
import org.jetbrains.annotations.NonNls
import java.nio.file.Files
@@ -72,6 +73,10 @@ internal class RunWithTemporaryAccount(
BrambleCoreEagerSingletons.Helper.injectEagerSingletons(app)
BriarCoreEagerSingletons.Helper.injectEagerSingletons(app)
+ Thread.setDefaultUncaughtExceptionHandler { t, e ->
+ LOG.w(e) { "Uncaught exception in thread ${t.name}" }
+ }
+
val lifecycleManager = app.getLifecycleManager()
val accountManager = app.getAccountManager()
--
GitLab