From ad9bc79cb77c3263129d1d2477baffb6c17e8639 Mon Sep 17 00:00:00 2001 From: Vladimir Lagunov Date: Fri, 8 Nov 2024 16:16:33 +0100 Subject: [PATCH] IJPL-166435 IJent: change log level of the server-side app in runtime (cherry picked from commit 582b8d52d52c4776188f1fc22fe896d9fb40c9e4) IJ-CR-148991 GitOrigin-RevId: 762baeed11b0785d735943d22a8e662a7a33ce50 --- .../intellij/platform/ijent/IjentProcessUtil.kt | 13 ------------- .../logs/LogLevelConfigurationManager.kt | 17 +++++++++++++++++ .../src/META-INF/PlatformExtensionPoints.xml | 1 + 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/platform/ijent/src/com/intellij/platform/ijent/IjentProcessUtil.kt b/platform/ijent/src/com/intellij/platform/ijent/IjentProcessUtil.kt index 006293d4867f..138fad7f8c1f 100644 --- a/platform/ijent/src/com/intellij/platform/ijent/IjentProcessUtil.kt +++ b/platform/ijent/src/com/intellij/platform/ijent/IjentProcessUtil.kt @@ -3,9 +3,7 @@ package com.intellij.platform.ijent -import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.diagnostic.Logger -import com.intellij.openapi.util.registry.Registry import com.intellij.util.containers.map2Array /** @@ -17,23 +15,12 @@ fun getIjentGrpcArgv( selfDeleteOnExit: Boolean = false, usrBinEnv: String = "/usr/bin/env", ): List { - val debuggingLogLevel = when { - LOG.isTraceEnabled && - (ApplicationManager.getApplication()?.isUnitTestMode == true || System.getProperty("ijent.trace.all") == "true") -> - "trace-all" - - LOG.isTraceEnabled -> "trace" - LOG.isDebugEnabled -> "debug" - else -> "info" - } - return listOfNotNull( usrBinEnv, *additionalEnv.entries.map2Array { (k, v) -> "$k=$v" }, // "gdbserver", "0.0.0.0:12345", // https://sourceware.org/gdb/onlinedocs/gdb/Connecting.html remotePathToIjent, "grpc-stdio-server", - "--log-level", debuggingLogLevel, if (selfDeleteOnExit) "--self-delete-on-exit" else null, ) } diff --git a/platform/platform-impl/src/com/intellij/diagnostic/logs/LogLevelConfigurationManager.kt b/platform/platform-impl/src/com/intellij/diagnostic/logs/LogLevelConfigurationManager.kt index 5b2476767aac..24540f30858c 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/logs/LogLevelConfigurationManager.kt +++ b/platform/platform-impl/src/com/intellij/diagnostic/logs/LogLevelConfigurationManager.kt @@ -3,7 +3,9 @@ package com.intellij.diagnostic.logs import com.intellij.openapi.components.* import com.intellij.openapi.diagnostic.logger +import com.intellij.openapi.extensions.ExtensionPointName import kotlinx.serialization.Serializable +import org.jetbrains.annotations.ApiStatus.Internal import java.util.logging.Level /** @@ -28,6 +30,20 @@ class LogLevelConfigurationManager : SerializablePersistentStateComponent = ExtensionPointName.create("com.intellij.logLevelConfigurationListener") + } + } + private val customizedLoggers = mutableListOf() private val lock = Object() @@ -41,6 +57,7 @@ class LogLevelConfigurationManager : SerializablePersistentStateComponent +