Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
ab08a665
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,发现更多精彩内容 >>
提交
ab08a665
编写于
6月 04, 2015
作者:
J
jialinsun
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of code.dianpingoa.com:arch/cat
上级
49230997
e4e36fc5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
29 deletion
+37
-29
cat-consumer/src/main/java/com/dianping/cat/consumer/event/EventDelegate.java
...n/java/com/dianping/cat/consumer/event/EventDelegate.java
+17
-13
cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionDelegate.java
...ianping/cat/consumer/transaction/TransactionDelegate.java
+20
-16
未找到文件。
cat-consumer/src/main/java/com/dianping/cat/consumer/event/EventDelegate.java
浏览文件 @
ab08a665
...
...
@@ -65,25 +65,29 @@ public class EventDelegate implements ReportDelegate<EventReport> {
}
public
EventReport
createAggregatedReport
(
Map
<
String
,
EventReport
>
reports
)
{
EventReport
first
=
reports
.
values
().
iterator
().
next
();
EventReport
all
=
makeReport
(
Constants
.
ALL
,
first
.
getStartTime
().
getTime
(),
Constants
.
HOUR
);
EventReportTypeAggregator
visitor
=
new
EventReportTypeAggregator
(
all
,
m_allManager
);
if
(
reports
.
size
()
>
0
)
{
EventReport
first
=
reports
.
values
().
iterator
().
next
();
EventReport
all
=
makeReport
(
Constants
.
ALL
,
first
.
getStartTime
().
getTime
(),
Constants
.
HOUR
);
EventReportTypeAggregator
visitor
=
new
EventReportTypeAggregator
(
all
,
m_allManager
);
try
{
for
(
EventReport
report
:
reports
.
values
())
{
String
domain
=
report
.
getDomain
();
try
{
for
(
EventReport
report
:
reports
.
values
())
{
String
domain
=
report
.
getDomain
();
if
(!
domain
.
equals
(
Constants
.
ALL
))
{
all
.
getIps
().
add
(
domain
);
all
.
getDomainNames
().
add
(
domain
);
if
(!
domain
.
equals
(
Constants
.
ALL
))
{
all
.
getIps
().
add
(
domain
);
all
.
getDomainNames
().
add
(
domain
);
visitor
.
visitEventReport
(
report
);
visitor
.
visitEventReport
(
report
);
}
}
}
catch
(
Exception
e
)
{
Cat
.
logError
(
e
);
}
}
catch
(
Exception
e
)
{
Cat
.
logError
(
e
);
return
all
;
}
else
{
return
new
EventReport
(
Constants
.
ALL
);
}
return
all
;
}
@Override
...
...
cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionDelegate.java
浏览文件 @
ab08a665
...
...
@@ -68,25 +68,29 @@ public class TransactionDelegate implements ReportDelegate<TransactionReport> {
}
public
TransactionReport
createAggregatedReport
(
Map
<
String
,
TransactionReport
>
reports
)
{
TransactionReport
first
=
reports
.
values
().
iterator
().
next
();
TransactionReport
all
=
makeReport
(
ALL
,
first
.
getStartTime
().
getTime
(),
Constants
.
HOUR
);
TransactionReportTypeAggregator
visitor
=
new
TransactionReportTypeAggregator
(
all
,
m_transactionManager
);
try
{
for
(
TransactionReport
report
:
reports
.
values
())
{
String
domain
=
report
.
getDomain
();
if
(!
domain
.
equals
(
Constants
.
ALL
))
{
all
.
getIps
().
add
(
domain
);
all
.
getDomainNames
().
add
(
domain
);
visitor
.
visitTransactionReport
(
report
);
if
(
reports
.
size
()
>
0
)
{
TransactionReport
first
=
reports
.
values
().
iterator
().
next
();
TransactionReport
all
=
makeReport
(
ALL
,
first
.
getStartTime
().
getTime
(),
Constants
.
HOUR
);
TransactionReportTypeAggregator
visitor
=
new
TransactionReportTypeAggregator
(
all
,
m_transactionManager
);
try
{
for
(
TransactionReport
report
:
reports
.
values
())
{
String
domain
=
report
.
getDomain
();
if
(!
domain
.
equals
(
Constants
.
ALL
))
{
all
.
getIps
().
add
(
domain
);
all
.
getDomainNames
().
add
(
domain
);
visitor
.
visitTransactionReport
(
report
);
}
}
}
catch
(
Exception
e
)
{
Cat
.
logError
(
e
);
}
}
catch
(
Exception
e
)
{
Cat
.
logError
(
e
);
return
all
;
}
else
{
return
new
TransactionReport
(
ALL
);
}
return
all
;
}
@Override
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录