From cdb98d2175db80a15ed87138dbe18675c05c6d61 Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Thu, 25 Sep 2025 00:01:23 +0200 Subject: [PATCH] Feature/reduce logging (#1667) * Reduce Hikari related logging * Reduce WebView related logging --- .../suwayomi/tachidesk/global/impl/KcefWebView.kt | 12 ++++++------ .../kotlin/suwayomi/tachidesk/global/impl/WebView.kt | 3 +-- .../kotlin/suwayomi/tachidesk/server/ServerSetup.kt | 2 +- .../suwayomi/tachidesk/server/database/DBManager.kt | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/KcefWebView.kt b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/KcefWebView.kt index f123a8be..deeb1806 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/KcefWebView.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/KcefWebView.kt @@ -135,7 +135,7 @@ class KcefWebView { ConsoleEvent(level.ordinal, message, source, line), ), ) - logger.debug { "$source:$line: $message" } + logger.trace { "$source:$line: $message" } return true } @@ -173,7 +173,7 @@ class KcefWebView { frame: CefFrame, httpStatusCode: Int, ) { - logger.info { "Load event: ${frame.name} - ${frame.url}" } + logger.trace { "Load event: ${frame.name} - ${frame.url}" } if (httpStatusCode > 0 && frame.isMain) handleLoad(frame.url, httpStatusCode) flush() } @@ -199,7 +199,7 @@ class KcefWebView { requestInitiator: String, disableDefaultHandling: BoolRef, ): CefResourceRequestHandler? { - logger.info { "Load resource: ${frame.name} - ${request.url}" } + logger.trace { "Load resource: ${frame.name} - ${request.url}" } return null } } @@ -253,7 +253,7 @@ class KcefWebView { addRequestHandler(RequestHandler()) } - logger.info { "Start loading cookies" } + logger.debug { "Start loading cookies" } CefCookieManager.getGlobalManager().apply { val cookies = networkHelper.cookieStore.getStoredCookies() for (cookie in cookies) { @@ -307,7 +307,7 @@ class KcefWebView { private fun flush() { if (browser == null) return - logger.info { "Start cookie flush" } + logger.trace { "Start cookie flush" } CefCookieManager.getGlobalManager().visitAllCookies { it, _, _, _ -> try { networkHelper.cookieStore.addAll( @@ -631,7 +631,7 @@ class KcefWebView { error: String? = null, ) { browser!!.evaluateJavaScript("return document.title") { - logger.info { "Load finished with title $it" } + logger.trace { "Load finished with title $it" } WebView.notifyAllClients( Json.encodeToString( LoadEvent(url, it ?: "", status, error), diff --git a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/WebView.kt b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/WebView.kt index 08514645..3e4f4a29 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/WebView.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/WebView.kt @@ -102,11 +102,10 @@ object WebView : Websocket() { val url = event.url dr.loadUrl(url) dr.resize(event.width, event.height) - logger.info { "Loading URL $url" } + logger.debug { "Loading URL $url" } } is ResizeMessage -> { dr.resize(event.width, event.height) - logger.info { "Resize browser" } } is JsEventMessage -> { dr.event(event) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt index fda7e2d2..1e159987 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt @@ -437,8 +437,8 @@ fun applicationSetup() { runMigrations(applicationDirs) - // Disable jetty's logging setLogLevelFor("org.eclipse.jetty", Level.OFF) + setLogLevelFor("com.zaxxer.hikari", Level.WARN) // socks proxy settings serverConfig.subscribeTo( diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/database/DBManager.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/database/DBManager.kt index b0c57388..1bcd9cdc 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/database/DBManager.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/database/DBManager.kt @@ -133,13 +133,13 @@ fun databaseUp() { // Log pool statistics DBManager.getPoolStats()?.let { stats -> - logger.info { "HikariCP initialized: $stats" } + logger.debug { "HikariCP initialized: $stats" } } // Add shutdown hook to properly close HikariCP pool Runtime.getRuntime().addShutdownHook( Thread { - logger.info { "Shutting down HikariCP connection pool..." } + logger.debug { "Shutting down HikariCP connection pool..." } DBManager.shutdown() }, )