Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
0c9d978f
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 搜索 >>
提交
0c9d978f
编写于
11月 27, 2013
作者:
Y
yong.you
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify the state analyzer
上级
df803fe0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
16 deletion
+16
-16
cat-client/src/test/java/com/dianping/cat/AllTests.java
cat-client/src/test/java/com/dianping/cat/AllTests.java
+5
-2
cat-consumer/src/main/java/com/dianping/cat/consumer/state/StateAnalyzer.java
...n/java/com/dianping/cat/consumer/state/StateAnalyzer.java
+11
-14
未找到文件。
cat-client/src/test/java/com/dianping/cat/AllTests.java
浏览文件 @
0c9d978f
...
...
@@ -10,6 +10,7 @@ import com.dianping.cat.abtest.spi.internal.ABTestCodecTest;
import
com.dianping.cat.abtest.spi.internal.ABTestContextTest
;
import
com.dianping.cat.abtest.spi.internal.ABTestEntityManagerTest
;
import
com.dianping.cat.abtest.spi.internal.groupstrategy.TrafficDistributionGroupStrategyTest
;
import
com.dianping.cat.agent.MmapConsumerTaskTest
;
import
com.dianping.cat.configuration.ConfigTest
;
import
com.dianping.cat.log4j.CatAppenderTest
;
import
com.dianping.cat.message.EventTest
;
...
...
@@ -32,7 +33,7 @@ CatAppenderTest.class,
MessageTest
.
class
,
/* .abtest */
TrafficDistributionGroupStrategyTest
.
class
,
TrafficDistributionGroupStrategyTest
.
class
,
ABTestCodecTest
.
class
,
...
...
@@ -69,7 +70,9 @@ CatFilterTest.class,
/* .tool */
ToolsTest
.
class
,
CatTest
.
class
CatTest
.
class
,
MmapConsumerTaskTest
.
class
})
public
class
AllTests
{
...
...
cat-consumer/src/main/java/com/dianping/cat/consumer/state/StateAnalyzer.java
浏览文件 @
0c9d978f
...
...
@@ -37,10 +37,10 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
@Inject
private
DomainManager
m_domainManager
;
@Inject
private
ServerConfigManager
m_serverConfigManager
;
@Inject
private
String
m_ip
=
NetworkInterfaceManager
.
INSTANCE
.
getLocalHostAddress
();
...
...
@@ -78,7 +78,7 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
long
value
=
entry
.
getValue
().
get
();
ProcessDomain
domain
=
machine
.
findOrCreateProcessDomain
(
key
);
Detail
detail
=
domain
.
findOrCreateDetail
(
start
);
if
(
totals
.
containsKey
(
key
))
{
domain
.
setTotal
(
value
+
domain
.
getTotal
());
detail
.
setTotal
(
value
);
...
...
@@ -185,7 +185,7 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
@Override
public
StateReport
getReport
(
String
domain
)
{
StateReport
report
=
new
StateReport
(
Constants
.
CAT
);
report
.
setStartTime
(
new
Date
(
m_startTime
));
report
.
setEndTime
(
new
Date
(
m_startTime
+
MINUTE
*
60
-
1
));
report
.
getMachines
().
clear
();
...
...
@@ -221,17 +221,14 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
if
(
ipInfo
==
null
)
{
m_domainManager
.
insert
(
domain
,
ip
);
}
else
if
(!
ipInfo
.
getIp
().
equals
(
ip
))
{
String
localIp
=
NetworkInterfaceManager
.
INSTANCE
.
getLocalHostAddress
();
}
else
if
(!
ipInfo
.
getDomain
().
equals
(
domain
))
{
// only work on online environment
if
(
localIp
.
startsWith
(
"10."
))
{
long
current
=
System
.
currentTimeMillis
();
long
lastModifyTime
=
ipInfo
.
getLastModifiedDate
().
getTime
();
if
(
current
-
lastModifyTime
>
ONE_HOUR
)
{
m_domainManager
.
update
(
ipInfo
.
getId
(),
domain
,
ip
);
m_logger
.
info
(
String
.
format
(
"change ip %s to domain %s"
,
ipInfo
.
getIp
(),
domain
));
}
long
current
=
System
.
currentTimeMillis
();
long
lastModifyTime
=
ipInfo
.
getLastModifiedDate
().
getTime
();
if
(
current
-
lastModifyTime
>
ONE_HOUR
)
{
m_domainManager
.
update
(
ipInfo
.
getId
(),
domain
,
ip
);
m_logger
.
info
(
String
.
format
(
"change ip %s to domain %s"
,
ipInfo
.
getIp
(),
domain
));
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录