From 582ae40c6ce7b1dd45ac083b459b2e3fc0d6aa5b Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Wed, 28 Jul 2021 23:28:17 +0800 Subject: [PATCH] Add null value to config table Signed-off-by: Gao Hongtao --- .../ConfigmapConfigurationWatcherRegister.java | 5 +---- .../oap/server/core/logging/LoggingConfigWatcher.java | 10 ++++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigurationWatcherRegister.java b/oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigurationWatcherRegister.java index c6bcdbc150..f3ca25c4bc 100644 --- a/oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigurationWatcherRegister.java +++ b/oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigurationWatcherRegister.java @@ -19,7 +19,6 @@ package org.apache.skywalking.oap.server.configuration.configmap; import io.kubernetes.client.openapi.models.V1ConfigMap; -import java.util.Objects; import java.util.Optional; import java.util.Set; import lombok.extern.slf4j.Slf4j; @@ -46,9 +45,7 @@ public class ConfigmapConfigurationWatcherRegister extends ConfigWatcherRegister if (log.isDebugEnabled()) { log.debug("read config: name:{} ,value:{}", name, value); } - if (Objects.nonNull(value)) { - configTable.add(new ConfigTable.ConfigItem(name, value)); - } + configTable.add(new ConfigTable.ConfigItem(name, value)); } return Optional.of(configTable); } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/logging/LoggingConfigWatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/logging/LoggingConfigWatcher.java index 4d19ea20ad..6ea59e9295 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/logging/LoggingConfigWatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/logging/LoggingConfigWatcher.java @@ -31,8 +31,8 @@ import org.apache.skywalking.oap.server.core.logging.log4j.OapConfiguration; import org.apache.skywalking.oap.server.library.module.ModuleProvider; /** - * LoggingConfigWatcher watches the change of logging configuration. - * Once got the change content, it would apply them to the current logger context. + * LoggingConfigWatcher watches the change of logging configuration. Once got the change content, it would apply them to + * the current logger context. */ @Slf4j public class LoggingConfigWatcher extends ConfigChangeWatcher { @@ -65,8 +65,10 @@ public class LoggingConfigWatcher extends ConfigChangeWatcher { } StringBuilder builder = new StringBuilder(); ctx.getConfiguration().getLoggers().forEach((loggerName, config) -> { - builder.append(loggerName).append("-").append(config.getName()).append(":") - .append(config.getLevel()).append(","); + builder.append(Strings.isNullOrEmpty(loggerName) ? "Root" : loggerName) + .append(":") + .append(config.getLevel()) + .append(","); }); this.content = builder.toString(); } -- GitLab