From 8667234fe392524078cbf26e7e57f45d70023458 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Mon, 19 Apr 2021 19:43:45 +0000
Subject: [PATCH] EmphasizedLogSupport from ProjectForge copied.
---
borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/BorgButlerApplication.kt | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/BorgButlerApplication.kt b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/BorgButlerApplication.kt
index d577112..935dc57 100644
--- a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/BorgButlerApplication.kt
+++ b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/BorgButlerApplication.kt
@@ -1,5 +1,6 @@
package de.micromata.borgbutler.server
+import de.micromata.borgbutler.EmphasizedLogSupport
import de.micromata.borgbutler.cache.ButlerCache
import de.micromata.borgbutler.config.ConfigurationHandler
import de.micromata.borgbutler.config.ConfigurationHandler.Companion.init
@@ -119,23 +120,26 @@
}
val uri = URI.create(url)
val quietMode = line.hasOption('q')
+ val emphasizedLog = EmphasizedLogSupport(log)
if (!quietMode && RunningMode.desktopSupportsBrowse) {
try {
- log.info { "Trying to open your local web browser: $uri" }
+ emphasizedLog.log("Trying to open your local web browser: $uri")
Desktop.getDesktop().browse(uri)
} catch (ex: Exception) {
- log.info("Can't open web browser: " + ex.message, ex)
- log.info("Desktop not available. Please open your browser manually: $uri")
+ emphasizedLog.logLevel = EmphasizedLogSupport.LogLevel.ERROR
+ emphasizedLog.log("Can't open web browser: " + ex.message)
+ emphasizedLog.log("Desktop not available. Please open your browser manually: $uri")
}
} else {
if (quietMode) {
- log.info("Server started in quiet mode (option -q). Please open your browser manually: $uri")
+ emphasizedLog.log("Server started in quiet mode (option -q). Please open your browser manually: $uri")
} else if (RunningMode.headlessMode) {
- log.info("Desktop not available in headless mode. Please open your browser manually: $uri")
+ emphasizedLog.log("Desktop not available in headless mode. Please open your browser manually: $uri")
} else if (!RunningMode.desktopSupportsBrowse) {
- log.info("Desktop not available. Please open your browser manually: $uri")
+ emphasizedLog.log("Desktop not available. Please open your browser manually: $uri")
}
}
+ emphasizedLog.logEnd()
} catch (ex: ParseException) {
// oops, something went wrong
System.err.println("Parsing failed. Reason: " + ex.message)
--
Gitblit v1.10.0