Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
6f9fdf2f
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6f9fdf2f
编写于
4月 17, 2015
作者:
J
jialinsun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor serverconfig manager
上级
e1bb3a29
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
17 deletion
+16
-17
cat-core/src/main/java/com/dianping/cat/config/server/ServerConfigManager.java
...a/com/dianping/cat/config/server/ServerConfigManager.java
+16
-17
未找到文件。
cat-core/src/main/java/com/dianping/cat/config/server/ServerConfigManager.java
浏览文件 @
6f9fdf2f
...
...
@@ -43,7 +43,7 @@ public class ServerConfigManager implements Initializable, LogEnabled {
private
Set
<
String
>
m_unusedNames
=
new
HashSet
<
String
>();
private
Set
<
String
>
m_crashLogs
=
new
HashSet
<
String
>();
private
Set
<
String
>
m_crashLog
Domain
s
=
new
HashSet
<
String
>();
private
Set
<
String
>
m_invalidateDomains
=
new
HashSet
<
String
>();
...
...
@@ -107,7 +107,7 @@ public class ServerConfigManager implements Initializable, LogEnabled {
}
public
Set
<
String
>
getCrashLogs
()
{
return
m_crashLogs
;
return
m_crashLog
Domain
s
;
}
public
String
getHdfsBaseDir
(
String
id
)
{
...
...
@@ -251,7 +251,11 @@ public class ServerConfigManager implements Initializable, LogEnabled {
}
public
Set
<
String
>
getUnusedDomains
()
{
return
m_invalidateDomains
;
Set
<
String
>
unusedDomains
=
new
HashSet
<
String
>();
unusedDomains
.
addAll
(
m_invalidateDomains
);
unusedDomains
.
addAll
(
m_crashLogDomains
);
return
unusedDomains
;
}
@Override
...
...
@@ -278,19 +282,13 @@ public class ServerConfigManager implements Initializable, LogEnabled {
m_invalidateDomains
.
add
(
Constants
.
FRONT_END
);
m_invalidateDomains
.
add
(
"paas"
);
m_invalidateDomains
.
add
(
"SMS-RECEIVER"
);
m_invalidateDomains
.
add
(
"AndroidCrashLog"
);
m_invalidateDomains
.
add
(
"iOSCrashLog"
);
m_invalidateDomains
.
add
(
"MerchantAndroidCrashLog"
);
m_invalidateDomains
.
add
(
"MerchantIOSCrashLog"
);
m_invalidateDomains
.
add
(
"ApolloAndroidCrashLog"
);
m_invalidateDomains
.
add
(
"ApolloIOSCrashLog"
);
m_crashLogs
.
add
(
"AndroidCrashLog"
);
m_crashLogs
.
add
(
"iOSCrashLog"
);
m_crashLogs
.
add
(
"MerchantAndroidCrashLog"
);
m_crashLogs
.
add
(
"MerchantIOSCrashLog"
);
m_crashLogs
.
add
(
"ApolloAndroidCrashLog"
);
m_crashLogs
.
add
(
"ApolloIOSCrashLog"
);
m_crashLog
Domain
s
.
add
(
"AndroidCrashLog"
);
m_crashLog
Domain
s
.
add
(
"iOSCrashLog"
);
m_crashLog
Domain
s
.
add
(
"MerchantAndroidCrashLog"
);
m_crashLog
Domain
s
.
add
(
"MerchantIOSCrashLog"
);
m_crashLog
Domain
s
.
add
(
"ApolloAndroidCrashLog"
);
m_crashLog
Domain
s
.
add
(
"ApolloIOSCrashLog"
);
}
public
void
initialize
(
File
configFile
)
throws
Exception
{
...
...
@@ -344,7 +342,7 @@ public class ServerConfigManager implements Initializable, LogEnabled {
}
public
boolean
isCrashLog
(
String
domain
)
{
return
m_crashLogs
.
contains
(
domain
);
return
m_crashLog
Domain
s
.
contains
(
domain
);
}
public
boolean
isHdfsOn
()
{
...
...
@@ -415,7 +413,8 @@ public class ServerConfigManager implements Initializable, LogEnabled {
}
public
boolean
validateDomain
(
String
domain
)
{
return
!
m_invalidateDomains
.
contains
(
domain
)
&&
StringUtils
.
isNotEmpty
(
domain
);
return
!
m_invalidateDomains
.
contains
(
domain
)
&&
!
m_crashLogDomains
.
contains
(
domain
)
&&
StringUtils
.
isNotEmpty
(
domain
);
}
public
boolean
validateIp
(
String
str
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录