Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
582ae40c
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 大约 1 年
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
582ae40c
编写于
7月 28, 2021
作者:
G
Gao Hongtao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add null value to config table
Signed-off-by:
N
Gao Hongtao
<
hanahmily@gmail.com
>
上级
dde9a788
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
8 deletion
+7
-8
oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigurationWatcherRegister.java
...tion/configmap/ConfigmapConfigurationWatcherRegister.java
+1
-4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/logging/LoggingConfigWatcher.java
...walking/oap/server/core/logging/LoggingConfigWatcher.java
+6
-4
未找到文件。
oap-server/server-configuration/configuration-k8s-configmap/src/main/java/org/apache/skywalking/oap/server/configuration/configmap/ConfigmapConfigurationWatcherRegister.java
浏览文件 @
582ae40c
...
...
@@ -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
);
}
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/logging/LoggingConfigWatcher.java
浏览文件 @
582ae40c
...
...
@@ -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
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录