Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
f875ff10
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,体验更适合开发者的 AI 搜索 >>
提交
f875ff10
编写于
3月 06, 2019
作者:
W
wangyapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
optimize router code
上级
ba7da59e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
11 deletion
+11
-11
cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java
...ain/java/com/dianping/cat/system/page/router/Handler.java
+3
-2
cat-home/src/main/java/com/dianping/cat/system/page/router/config/RouterConfigAdjustor.java
...g/cat/system/page/router/config/RouterConfigAdjustor.java
+1
-1
cat-home/src/main/java/com/dianping/cat/system/page/router/config/RouterConfigManager.java
...ng/cat/system/page/router/config/RouterConfigManager.java
+7
-8
未找到文件。
cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java
浏览文件 @
f875ff10
...
...
@@ -93,7 +93,8 @@ public class Handler implements PageHandler<Context> {
return
buildServerStr
(
servers
);
}
private
double
buildSampleInfo
(
String
domain
,
double
defaultValue
)
{
private
double
buildSampleInfo
(
String
domain
)
{
double
defaultValue
=
1.0
;
com
.
dianping
.
cat
.
sample
.
entity
.
Domain
domainConfig
=
m_sampleConfigManager
.
getConfig
().
findDomain
(
domain
);
if
(
domainConfig
!=
null
)
{
...
...
@@ -178,7 +179,7 @@ public class Handler implements PageHandler<Context> {
kvs
.
put
(
"block"
,
String
.
valueOf
(
m_configManager
.
shouldBlock
(
ip
)));
kvs
.
put
(
"routers"
,
buildRouterInfo
(
ip
,
domain
,
report
));
kvs
.
put
(
"sample"
,
String
.
valueOf
(
buildSampleInfo
(
domain
,
1.0
)));
kvs
.
put
(
"sample"
,
String
.
valueOf
(
buildSampleInfo
(
domain
)));
kvs
.
put
(
"startTransactionTypes"
,
m_filterManager
.
getAtomicStartTypes
());
kvs
.
put
(
"matchTransactionTypes"
,
m_filterManager
.
getAtomicMatchTypes
());
...
...
cat-home/src/main/java/com/dianping/cat/system/page/router/config/RouterConfigAdjustor.java
浏览文件 @
f875ff10
...
...
@@ -228,7 +228,7 @@ public class RouterConfigAdjustor {
private
Map
<
Server
,
Long
>
processGroupMachines
(
Map
<
String
,
Machine
>
machines
)
{
Map
<
Server
,
Long
>
results
=
new
HashMap
<
Server
,
Long
>();
long
total
=
calculateTotal
(
machines
);
L
ong
minGap
=
total
/
100
;
l
ong
minGap
=
total
/
100
;
long
avg
=
total
/
machines
.
size
();
for
(
Machine
machine
:
machines
.
values
())
{
...
...
cat-home/src/main/java/com/dianping/cat/system/page/router/config/RouterConfigManager.java
浏览文件 @
f875ff10
...
...
@@ -301,9 +301,8 @@ public class RouterConfigManager implements Initializable, LogEnabled {
synchronized
(
this
)
{
if
(
modifyTime
>
m_modifyTime
)
{
String
content
=
config
.
getContent
();
RouterConfig
routerConfig
=
DefaultSaxParser
.
parse
(
content
);
m_routerConfig
=
routerConfig
;
m_routerConfig
=
DefaultSaxParser
.
parse
(
content
)
;
m_modifyTime
=
modifyTime
;
refreshNetInfo
();
}
...
...
@@ -340,25 +339,25 @@ public class RouterConfigManager implements Initializable, LogEnabled {
long
time
=
period
.
getTime
();
try
{
DailyReport
report
=
m_dailyReportDao
.
findByDomainNamePeriod
(
Constants
.
CAT
,
RouterConfigBuilder
.
ID
,
period
,
DailyReportEntity
.
READSET_FULL
);
DailyReport
report
=
m_dailyReportDao
.
findByDomainNamePeriod
(
Constants
.
CAT
,
RouterConfigBuilder
.
ID
,
period
,
DailyReportEntity
.
READSET_FULL
);
long
modifyTime
=
report
.
getCreationDate
().
getTime
();
Pair
<
RouterConfig
,
Long
>
pair
=
m_routerConfigs
.
get
(
time
);
if
(
pair
==
null
||
modifyTime
>
pair
.
getValue
())
{
try
{
DailyReportContent
reportContent
=
m_dailyReportContentDao
.
findByPK
(
report
.
getId
(),
DailyReportContentEntity
.
READSET_FULL
);
DailyReportContent
reportContent
=
m_dailyReportContentDao
.
findByPK
(
report
.
getId
(),
DailyReportContentEntity
.
READSET_FULL
);
RouterConfig
routerConfig
=
DefaultNativeParser
.
parse
(
reportContent
.
getContent
());
m_routerConfigs
.
put
(
time
,
new
Pair
<
RouterConfig
,
Long
>(
routerConfig
,
modifyTime
));
Cat
.
logEvent
(
"ReloadConfig"
,
"router"
);
}
catch
(
DalNotFoundException
ignored
)
{
}
}
}
catch
(
DalNotFoundException
ignored
)
{
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录