Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
a17fb5c6
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,发现更多精彩内容 >>
提交
a17fb5c6
编写于
2月 04, 2012
作者:
F
Frankie Wu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
web page simplification
上级
4b9ff5ab
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
184 addition
and
44 deletion
+184
-44
cat-consumer/src/main/java/com/dianping/cat/consumer/RealtimeConsumer.java
...main/java/com/dianping/cat/consumer/RealtimeConsumer.java
+3
-2
cat-home/src/main/java/com/dianping/cat/report/ReportPage.java
...ome/src/main/java/com/dianping/cat/report/ReportPage.java
+2
-2
cat-home/src/main/resources/META-INF/wizard/webapp/wizard.xml
...home/src/main/resources/META-INF/wizard/webapp/wizard.xml
+1
-1
cat-home/src/main/webapp/WEB-INF/app.tld
cat-home/src/main/webapp/WEB-INF/app.tld
+4
-0
cat-home/src/main/webapp/WEB-INF/tags/body.tag
cat-home/src/main/webapp/WEB-INF/tags/body.tag
+5
-1
cat-home/src/main/webapp/WEB-INF/tags/report.tag
cat-home/src/main/webapp/WEB-INF/tags/report.tag
+44
-0
cat-home/src/main/webapp/css/body.css
cat-home/src/main/webapp/css/body.css
+59
-0
cat-home/src/main/webapp/css/default.css
cat-home/src/main/webapp/css/default.css
+1
-0
cat-home/src/main/webapp/css/report.css
cat-home/src/main/webapp/css/report.css
+48
-0
cat-home/src/main/webapp/jsp/report/ip.jsp
cat-home/src/main/webapp/jsp/report/ip.jsp
+17
-38
未找到文件。
cat-consumer/src/main/java/com/dianping/cat/consumer/RealtimeConsumer.java
浏览文件 @
a17fb5c6
...
@@ -100,14 +100,15 @@ public class RealtimeConsumer extends ContainerHolder implements MessageConsumer
...
@@ -100,14 +100,15 @@ public class RealtimeConsumer extends ContainerHolder implements MessageConsumer
@Inject
@Inject
private
long
m_extraTime
=
FIVE_MINUTES
;
private
long
m_extraTime
=
FIVE_MINUTES
;
@Inject
private
int
m_threads
=
10
;
@Inject
@Inject
private
List
<
String
>
m_analyzerNames
;
private
List
<
String
>
m_analyzerNames
;
@Inject
@Inject
private
AnalyzerFactory
m_factory
;
private
AnalyzerFactory
m_factory
;
private
int
m_threads
=
10
;
private
ExecutorService
m_executor
;
private
ExecutorService
m_executor
;
private
List
<
Period
>
m_periods
=
new
ArrayList
<
Period
>(
PROCESS_PERIOD
);
private
List
<
Period
>
m_periods
=
new
ArrayList
<
Period
>(
PROCESS_PERIOD
);
...
...
cat-home/src/main/java/com/dianping/cat/report/ReportPage.java
浏览文件 @
a17fb5c6
...
@@ -11,9 +11,9 @@ public enum ReportPage implements Page {
...
@@ -11,9 +11,9 @@ public enum ReportPage implements Page {
FAILURE
(
"failure"
,
"f"
,
"Failure"
,
true
),
FAILURE
(
"failure"
,
"f"
,
"Failure"
,
true
),
LOGVIEW
(
"logview"
,
"m"
,
"Logview"
,
tru
e
),
LOGVIEW
(
"logview"
,
"m"
,
"Logview"
,
fals
e
),
IP
(
"ip"
,
"ip"
,
"
Ip Address
"
,
true
);
IP
(
"ip"
,
"ip"
,
"
Top IP List
"
,
true
);
private
String
m_name
;
private
String
m_name
;
...
...
cat-home/src/main/resources/META-INF/wizard/webapp/wizard.xml
浏览文件 @
a17fb5c6
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<page
name=
"transaction"
path=
"t"
description=
"Transaction"
/>
<page
name=
"transaction"
path=
"t"
description=
"Transaction"
/>
<page
name=
"failure"
path=
"f"
description=
"Failure"
/>
<page
name=
"failure"
path=
"f"
description=
"Failure"
/>
<page
name=
"logview"
path=
"m"
description=
"Logview"
/>
<page
name=
"logview"
path=
"m"
description=
"Logview"
/>
<page
name=
"ip"
description=
"
Ip Address
"
/>
<page
name=
"ip"
description=
"
Top IP List
"
/>
</module>
</module>
</wizard>
</wizard>
cat-home/src/main/webapp/WEB-INF/app.tld
浏览文件 @
a17fb5c6
...
@@ -15,6 +15,10 @@
...
@@ -15,6 +15,10 @@
<name>
body
</name>
<name>
body
</name>
<path>
/WEB-INF/tags/body.tag
</path>
<path>
/WEB-INF/tags/body.tag
</path>
</tag-file>
</tag-file>
<tag-file>
<name>
report
</name>
<path>
/WEB-INF/tags/report.tag
</path>
</tag-file>
<function>
<function>
<description>
Build form action for given id
</description>
<description>
Build form action for given id
</description>
<name>
action
</name>
<name>
action
</name>
...
...
cat-home/src/main/webapp/WEB-INF/tags/body.tag
浏览文件 @
a17fb5c6
<
%@
tag
trimDirectiveWhitespaces=
"true"
%
>
<
%@
taglib
prefix=
"c"
uri=
"http://java.sun.com/jsp/jstl/core"
%
>
<
%@
taglib
prefix=
"c"
uri=
"http://java.sun.com/jsp/jstl/core"
%
>
<
%@
taglib
prefix=
"res"
uri=
"http://www.ebay.com/webres"
%
>
<
%@
taglib
prefix=
"res"
uri=
"http://www.ebay.com/webres"
%
>
<jsp:useBean
id=
"navBar"
class=
"com.dianping.garden.view.NavigationBar"
scope=
"page"
/>
<jsp:useBean
id=
"navBar"
class=
"com.dianping.garden.view.NavigationBar"
scope=
"page"
/>
...
@@ -9,7 +10,7 @@
...
@@ -9,7 +10,7 @@
<meta
http-equiv=
"content-type"
content=
"text/html; charset=UTF-8"
/>
<meta
http-equiv=
"content-type"
content=
"text/html; charset=UTF-8"
/>
<res:cssSlot
id=
"head-css"
/>
<res:cssSlot
id=
"head-css"
/>
<res:jsSlot
id=
"head-js"
/>
<res:jsSlot
id=
"head-js"
/>
<res:useCss
value=
'${res.css.local.
default
_css}'
target=
"head-css"
/>
<res:useCss
value=
'${res.css.local.
body
_css}'
target=
"head-css"
/>
</head>
</head>
<body>
<body>
<h1>
<h1>
...
@@ -20,6 +21,9 @@
...
@@ -20,6 +21,9 @@
<c:if
test=
"${page.realPage}"
>
<c:if
test=
"${page.realPage}"
>
<li
${
model.page.name =
=
page.name
?
'
class=
"selected"
'
:
''}
><a
href=
"${model.webapp}/${page.moduleName}/${page.path}"
>
${page.description}
</a></li>
<li
${
model.page.name =
=
page.name
?
'
class=
"selected"
'
:
''}
><a
href=
"${model.webapp}/${page.moduleName}/${page.path}"
>
${page.description}
</a></li>
</c:if>
</c:if>
<c:if
test=
"${not page.realPage and model.page.name == page.name}"
>
<li
class=
"selected"
>
${page.description}
</li>
</c:if>
</c:forEach>
</c:forEach>
</ul>
</ul>
...
...
cat-home/src/main/webapp/WEB-INF/tags/report.tag
0 → 100644
浏览文件 @
a17fb5c6
<%@ tag trimDirectiveWhitespaces="true" %>
<%@ taglib prefix="a" uri="/WEB-INF/app.tld"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="res" uri="http://www.ebay.com/webres"%>
<%@ attribute name="title"%>
<%@ attribute name="timestamp"%>
<%@ attribute name="domain" fragment="true"%>
<%@ attribute name="time" fragment="true"%>
<%@ attribute name="subtitle" fragment="true"%>
<a:body>
<res:useCss value='${res.css.local.report_css}' target="head-css" />
<div class="report">
<table class="header">
<tr>
<td class="title">${title}</td>
<td class="timestamp">Generated: ${timestamp}</td>
</tr>
</table>
<table class="navbar">
<tr>
<td class="domain"><jsp:invoke fragment="domain"/></td>
<td class="time"><jsp:invoke fragment="time"/></td>
</tr>
<tr>
<td class="subtitle"><jsp:invoke fragment="subtitle"/></td>
</tr>
</table>
<br />
<jsp:doBody />
<br />
<table class="footer">
<tr>
<td>[ end ]</td>
</tr>
</table>
</div>
</a:body>
\ No newline at end of file
cat-home/src/main/webapp/css/body.css
0 → 100644
浏览文件 @
a17fb5c6
body
{
font-family
:
arial
,
helvetica
,
sans-serif
;
font-size
:
small
;
background
:
white
;
color
:
black
;
margin
:
4px
;
padding
:
0
;
}
html
{
margin
:
0
}
a
{
text-decoration
:
none
;
}
a
:hover
{
text-decoration
:
underline
;
}
ul
.tabs
{
border-bottom
:
1px
solid
gray
;
list-style-type
:
none
;
position
:
relative
;
padding
:
0em
;
padding-top
:
0.4em
;
padding-bottom
:
0.4em
;
}
.tabs
li
{
display
:
inline
;
margin
:
0em
0.4em
0em
0.4em
;
padding
:
0.4em
0.4em
0.4em
0.4em
;
overflow
:
hidden
;
border-top
:
1px
solid
gray
;
border-left
:
1px
solid
gray
;
border-right
:
1px
solid
gray
;
}
.tabs
li
.selected
{
background
:
#ccddff
;
border-bottom
:
1px
solid
white
;
}
tr
.head
{
background-color
:
#e8e8e8
;
}
tr
.strip
{
background-color
:
#f2f2f2
;
}
tr
.head
th
{
background-color
:
#f2f2f2
;
border-bottom
:
1px
solid
#c4c4c4
;
}
tr
th
{
background-color
:
#f2f2f2
;
}
cat-home/src/main/webapp/css/default.css
浏览文件 @
a17fb5c6
...
@@ -22,6 +22,7 @@ ul.tabs {
...
@@ -22,6 +22,7 @@ ul.tabs {
list-style-type
:
none
;
list-style-type
:
none
;
position
:
relative
;
position
:
relative
;
padding
:
0em
;
padding
:
0em
;
padding-top
:
0.4em
;
padding-bottom
:
0.4em
;
padding-bottom
:
0.4em
;
}
}
...
...
cat-home/src/main/webapp/css/report.css
0 → 100644
浏览文件 @
a17fb5c6
.report
.header
{
background
:
orange
;
color
:
white
;
font-weight
:
bold
;
border-bottom
:
solid
black
1px
;
width
:
100%
;
}
.report
.header
.title
{
font-weight
:
bold
;
}
.report
.header
.timestamp
{
white-space
:
nowrap
;
width
:
200px
;
}
.report
.navbar
{
background
:
lightblue
;
font-weight
:
bold
;
border-bottom
:
solid
black
1px
;
width
:
100%
;
}
.report
.navbar
.time
{
text-align
:
right
;
font-size
:
small
;
font-weight
:
bold
;
}
.report
.navbar
.time
A
{
text-decoration
:
none
;
color
:
blue
;
}
.report
.navbar
.time
A
:hover
{
color
:
yellow
;
}
.report
.footer
{
background
:
orange
;
color
:
white
;
font-weight
:
bold
;
border-top
:
solid
black
1px
;
border-bottom
:
solid
black
1px
;
width
:
100%
;
text-align
:
center
;
}
\ No newline at end of file
cat-home/src/main/webapp/jsp/report/ip.jsp
浏览文件 @
a17fb5c6
<%@ page
contentType=
"text/html; charset=utf-8"
%>
<%@ page
contentType=
"text/html; charset=utf-8"
trimDirectiveWhitespaces=
"true"
%>
<%@ taglib
prefix=
"a"
uri=
"/WEB-INF/app.tld"
%>
<%@ taglib
prefix=
"a"
uri=
"/WEB-INF/app.tld"
%>
<%@ taglib
prefix=
"c"
uri=
"http://java.sun.com/jsp/jstl/core"
%>
<%@ taglib
prefix=
"c"
uri=
"http://java.sun.com/jsp/jstl/core"
%>
<%@ taglib
prefix=
"res"
uri=
"http://www.ebay.com/webres"
%>
<%@ taglib
prefix=
"res"
uri=
"http://www.ebay.com/webres"
%>
<jsp:useBean
id=
"ctx"
type=
"com.dianping.cat.report.page.ip.Context"
scope=
"request"
/>
<jsp:useBean
id=
"ctx"
type=
"com.dianping.cat.report.page.ip.Context"
scope=
"request"
/>
<jsp:useBean
id=
"payload"
type=
"com.dianping.cat.report.page.ip.Payload"
scope=
"request"
/>
<jsp:useBean
id=
"payload"
type=
"com.dianping.cat.report.page.ip.Payload"
scope=
"request"
/>
<jsp:useBean
id=
"model"
type=
"com.dianping.cat.report.page.ip.Model"
scope=
"request"
/>
<jsp:useBean
id=
"model"
type=
"com.dianping.cat.report.page.ip.Model"
scope=
"request"
/>
<a:
body
>
<a:
report
title=
"Hot IP Report"
>
<res:useCss
value=
'
${
res
.
css
.
local
.
default_css
}
'
target=
"head-css"
/>
<jsp:attribute
name=
"domain"
>
<res:useCss
value=
'
${
res
.
css
.
local
.
style_css
}
'
target=
"head-css"
/>
hello
<res:useCss
value=
'
${
res
.
css
.
local
.
failure_css
}
'
target=
"head-css"
/>
</jsp:attribute>
<jsp:attribute
name=
"time"
>
<res:useJs
value=
'
${
res
.
js
.
local
.
mootools_js
}
'
target=
"head-js"
/>
[
<a
href=
""
>
-1d
</a>
] [
<a
href=
""
>
-2h
</a>
] [
<a
href=
""
>
-1h
</a>
] [
<a
href=
""
>
+1h
</a>
] [
<a
href=
""
>
+2h
</a>
] [
<a
href=
""
>
+1d
</a>
]
<res:useJs
value=
'
${
res
.
js
.
local
.
jquery_min_js
}
'
target=
"head-js"
/>
</jsp:attribute>
<res:useJs
value=
'
${
res
.
js
.
local
.
sql_scripts_js
}
'
target=
"head-js"
/>
<table
width=
"100%"
border=
"0"
cellpadding=
"6"
cellspacing=
"0"
class=
"fancy-header"
>
<tbody>
<tr>
<td
nowrap=
""
>
Dian Ping CAT Reports: \${model.reportTitle}
</td>
<td
width=
"100%"
align=
"right"
nowrap=
""
>
Generated: XXXXXX
</td>
<td
style=
"display:none"
><input
id=
"currentDomain"
value=
"\${model.currentDomain}"
>
<input
id=
"currentIp"
value=
"\${model.currentIp}"
></input></td>
</tr>
</tbody>
</table>
<jsp:body>
<pre>
<pre>
${model.reportInJson}
${model.reportInJson}
</pre>
</pre>
</jsp:body>
<table
width=
"100%"
border=
"0"
cellpadding=
"6"
cellspacing=
"0"
</a:report>
class=
"fancy-footer"
>
<tbody>
<tr>
<td
nowrap=
""
width=
"100%"
>
[ end ]
</td>
</tr>
</tbody>
</table>
<res:useJs
value=
"
${
res
.
js
.
local
.
failure_js
}
"
target=
"bottom-js"
/>
</a:body>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录