Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
232f757f
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,发现更多精彩内容 >>
提交
232f757f
编写于
8月 16, 2012
作者:
Y
youyong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify the cat history bug
上级
ed22e999
变更
12
显示空白变更内容
内联
并排
Showing
12 changed file
with
24 addition
and
15 deletion
+24
-15
cat-home/src/main/java/com/dianping/cat/report/page/AbstractReportPayload.java
...a/com/dianping/cat/report/page/AbstractReportPayload.java
+8
-3
cat-home/src/main/webapp/css/body.css
cat-home/src/main/webapp/css/body.css
+4
-0
cat-home/src/main/webapp/jsp/report/crossHistoryHost.jsp
cat-home/src/main/webapp/jsp/report/crossHistoryHost.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/crossHistoryMethod.jsp
cat-home/src/main/webapp/jsp/report/crossHistoryMethod.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/crossHistoryProject.jsp
cat-home/src/main/webapp/jsp/report/crossHistoryProject.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/eventHistoryReport.jsp
cat-home/src/main/webapp/jsp/report/eventHistoryReport.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/heartbeatHistoryGraph.jsp
...home/src/main/webapp/jsp/report/heartbeatHistoryGraph.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/matrixHistoryReport.jsp
cat-home/src/main/webapp/jsp/report/matrixHistoryReport.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/problemHistoryReport.jsp
cat-home/src/main/webapp/jsp/report/problemHistoryReport.jsp
+1
-1
cat-home/src/main/webapp/jsp/report/transactionHistoryReport.jsp
...e/src/main/webapp/jsp/report/transactionHistoryReport.jsp
+1
-1
cat-home/src/test/java/com/dianping/cat/demo/TestSendMessage.java
.../src/test/java/com/dianping/cat/demo/TestSendMessage.java
+3
-3
cat-home/src/test/java/com/dianping/cat/report/page/transaction/PayloadTest.java
...com/dianping/cat/report/page/transaction/PayloadTest.java
+1
-1
未找到文件。
cat-home/src/main/java/com/dianping/cat/report/page/AbstractReportPayload.java
浏览文件 @
232f757f
...
...
@@ -148,10 +148,15 @@ public abstract class AbstractReportPayload<A extends Action> implements ActionP
}
else
{
temp
=
m_date
+
(
ONE_HOUR
*
24
);
}
cal
.
setTimeInMillis
(
temp
-
1000
);
cal
.
setTimeInMillis
(
temp
);
return
cal
.
getTime
();
}
public
Date
getHistoryDisplayEndDate
()
{
Date
date
=
getHistoryEndDate
();
return
new
Date
(
date
.
getTime
()
-
1000
);
}
public
Date
getHistoryStartDate
()
{
if
(
m_customStart
!=
null
)
{
try
{
...
...
cat-home/src/main/webapp/css/body.css
浏览文件 @
232f757f
...
...
@@ -125,6 +125,10 @@ a.long-sql {
background-color
:
#6699CC
;
}
a
.long-service
{
background-color
:
#7799FF
;
}
a
.url
{
background-color
:
#cc0000
;
}
...
...
cat-home/src/main/webapp/jsp/report/crossHistoryHost.jsp
浏览文件 @
232f757f
...
...
@@ -10,7 +10,7 @@
<a:historyReport
title=
"Cross Report"
navUrlPrefix=
"ip=${model.ipAddress}&domain=${model.domain}"
>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.history
Display
EndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:body>
<res:useCss
value=
"
${
res
.
css
.
local
.
cross_css
}
"
target=
"head-css"
/>
...
...
cat-home/src/main/webapp/jsp/report/crossHistoryMethod.jsp
浏览文件 @
232f757f
...
...
@@ -10,7 +10,7 @@
<a:historyReport
title=
"Cross Report"
navUrlPrefix=
"ip=${model.ipAddress}&domain=${model.domain}"
>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.history
Display
EndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:body>
<res:useCss
value=
"
${
res
.
css
.
local
.
cross_css
}
"
target=
"head-css"
/>
...
...
cat-home/src/main/webapp/jsp/report/crossHistoryProject.jsp
浏览文件 @
232f757f
...
...
@@ -10,7 +10,7 @@
<a:historyReport
title=
"Cross Report"
navUrlPrefix=
"ip=${model.ipAddress}&domain=${model.domain}"
>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.history
Display
EndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:body>
<res:useCss
value=
"
${
res
.
css
.
local
.
cross_css
}
"
target=
"head-css"
/>
...
...
cat-home/src/main/webapp/jsp/report/eventHistoryReport.jsp
浏览文件 @
232f757f
...
...
@@ -8,7 +8,7 @@
<jsp:useBean
id=
"model"
type=
"com.dianping.cat.report.page.event.Model"
scope=
"request"
/>
<a:historyReport
title=
"History Report"
navUrlPrefix=
"type=${payload.type}&ip=${model.ipAddress}"
>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.history
Display
EndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:body>
<res:useCss
value=
"
${
res
.
css
.
local
.
event_css
}
"
target=
"head-css"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery-1.7.1.js'
]
}
"
target=
"head-js"
/>
...
...
cat-home/src/main/webapp/jsp/report/heartbeatHistoryGraph.jsp
浏览文件 @
232f757f
...
...
@@ -8,7 +8,7 @@
<jsp:useBean
id=
"model"
type=
"com.dianping.cat.report.page.heartbeat.Model"
scope=
"request"
/>
<a:historyReport
title=
"HeartBeat History Report"
>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.history
Display
EndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:body>
<res:useCss
value=
"
${
res
.
css
.
local
.
transaction_css
}
"
target=
"head-css"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery-1.7.1.js'
]
}
"
target=
"head-js"
/>
...
...
cat-home/src/main/webapp/jsp/report/matrixHistoryReport.jsp
浏览文件 @
232f757f
...
...
@@ -8,7 +8,7 @@
<jsp:useBean
id=
"model"
type=
"com.dianping.cat.report.page.matrix.Model"
scope=
"request"
/>
<a:historyReport
title=
"History Report"
navUrlPrefix=
"domain=${model.domain}"
>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.history
Display
EndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:body>
<res:useCss
value=
"
${
res
.
css
.
local
.
matrix_css
}
"
target=
"head-css"
/>
</br>
...
...
cat-home/src/main/webapp/jsp/report/problemHistoryReport.jsp
浏览文件 @
232f757f
...
...
@@ -9,7 +9,7 @@
<a:historyReport
title=
"History Report"
navUrlPrefix=
"threshold=${model.threshold}&sqlThreshold=${model.sqlThreshold}&ip=${model.ipAddress}"
>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.history
Display
EndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:body>
<res:useCss
value=
"
${
res
.
css
.
local
.
problem_css
}
"
target=
"head-css"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery-1.7.1.js'
]
}
"
target=
"head-js"
/>
...
...
cat-home/src/main/webapp/jsp/report/transactionHistoryReport.jsp
浏览文件 @
232f757f
...
...
@@ -8,7 +8,7 @@
<jsp:useBean
id=
"model"
type=
"com.dianping.cat.report.page.transaction.Model"
scope=
"request"
/>
<a:historyReport
title=
"History Report"
navUrlPrefix=
"type=${payload.type}&queryname=${model.queryName}"
>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.historyEndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(payload.historyStartDate,'yyyy-MM-dd HH:mm:ss')} to ${w:format(payload.history
Display
EndDate,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
<jsp:body>
<res:useCss
value=
"
${
res
.
css
.
local
.
transaction_css
}
"
target=
"head-css"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery-1.7.1.js'
]
}
"
target=
"head-js"
/>
...
...
cat-home/src/test/java/com/dianping/cat/demo/TestSendMessage.java
浏览文件 @
232f757f
...
...
@@ -65,7 +65,7 @@ public class TestSendMessage {
public
void
sendPigeonServerTransaction
()
throws
Exception
{
for
(
int
i
=
0
;
i
<
100
;
i
++)
{
Transaction
t
=
Cat
.
getProducer
().
newTransaction
(
"PigeonService"
,
"Method6"
);
Cat
.
getProducer
().
newEvent
(
"Pigeon
Call
.client"
,
"192.168.7.77"
);
Cat
.
getProducer
().
newEvent
(
"Pigeon
Service
.client"
,
"192.168.7.77"
);
t
.
addData
(
"key and value"
);
Thread
.
sleep
(
1
);
...
...
@@ -73,7 +73,7 @@ public class TestSendMessage {
}
for
(
int
i
=
0
;
i
<
200
;
i
++)
{
Transaction
t
=
Cat
.
getProducer
().
newTransaction
(
"PigeonService"
,
"Method8"
);
Cat
.
getProducer
().
newEvent
(
"Pigeon
Call
.client"
,
"192.168.7.20"
);
Cat
.
getProducer
().
newEvent
(
"Pigeon
Service
.client"
,
"192.168.7.20"
);
t
.
addData
(
"key and value"
);
Thread
.
sleep
(
1
);
...
...
@@ -82,7 +82,7 @@ public class TestSendMessage {
for
(
int
i
=
0
;
i
<
300
;
i
++)
{
Transaction
t
=
Cat
.
getProducer
().
newTransaction
(
"PigeonService"
,
"Method5"
);
Cat
.
getProducer
().
newEvent
(
"Pigeon
Call
.client"
,
"192.168.7.231"
);
Cat
.
getProducer
().
newEvent
(
"Pigeon
Service
.client"
,
"192.168.7.231"
);
t
.
addData
(
"key and value"
);
Thread
.
sleep
(
1
);
...
...
cat-home/src/test/java/com/dianping/cat/report/page/transaction/PayloadTest.java
浏览文件 @
232f757f
...
...
@@ -200,6 +200,6 @@ public class PayloadTest {
}
private
Date
adjustEndDate
(
Date
date
){
return
new
Date
(
date
.
getTime
()
+
1000
);
return
new
Date
(
date
.
getTime
());
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录