Skip to content

C
cat

梦中观雨 / cat
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

体验新版 GitCode，发现更多精彩内容 >>

提交 a17fb5c6 编写于 作者: F Frankie Wu
浏览文件
操作

web page simplification

上级 4b9ff5ab
隐藏空白更改
内联 并排
Showing with 184 addition and 44 deletion
cat-consumer/src/main/java/com/dianping/cat/consumer/RealtimeConsumer.java
浏览文件 @ a17fb5c6
......@@ -99,6 +99,9 @@ public class RealtimeConsumer extends ContainerHolder implements MessageConsumer
@Inject
private long m_extraTime = FIVE_MINUTES;
@Inject
private int m_threads = 10;
@Inject
private List<String> m_analyzerNames;
......@@ -106,8 +109,6 @@ public class RealtimeConsumer extends ContainerHolder implements MessageConsumer
@Inject
private AnalyzerFactory m_factory;
private int m_threads = 10;
private ExecutorService m_executor;
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 {
FAILURE("failure", "f", "Failure", true),
LOGVIEW("logview", "m", "Logview", true),
LOGVIEW("logview", "m", "Logview", false),
IP("ip", "ip", "Ip Address", true);
IP("ip", "ip", "Top IP List", true);
private String m_name;
......
cat-home/src/main/resources/META-INF/wizard/webapp/wizard.xml
浏览文件 @ a17fb5c6
......@@ -5,7 +5,7 @@
<page name="transaction" path="t" description="Transaction" />
<page name="failure" path="f" description="Failure" />
<page name="logview" path="m" description="Logview" />
<page name="ip" description="Ip Address" />
<page name="ip" description="Top IP List" />
</module>
</wizard>
cat-home/src/main/webapp/WEB-INF/app.tld
浏览文件 @ a17fb5c6
......@@ -15,6 +15,10 @@
<name>body</name>
<path>/WEB-INF/tags/body.tag</path>
</tag-file>
<tag-file>
<name>report</name>
<path>/WEB-INF/tags/report.tag</path>
</tag-file>
<function>
<description>Build form action for given id</description>
<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="res" uri="http://www.ebay.com/webres"%>
<jsp:useBean id="navBar" class="com.dianping.garden.view.NavigationBar" scope="page"/>
......@@ -9,7 +10,7 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<res:cssSlot id="head-css"/>
<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>
<body>
<h1>
......@@ -20,6 +21,9 @@
<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>
</c:if>
<c:if test="${not page.realPage and model.page.name == page.name}">
<li class="selected">${page.description}</li>
</c:if>
</c:forEach>
</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 {
list-style-type: none;
position: relative;
padding: 0em;
padding-top: 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="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ 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="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="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="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" />
<res:useCss value='${res.css.local.style_css}' target="head-css" />
<res:useCss value='${res.css.local.failure_css}' target="head-css" />
<jsp:attribute name="domain">
hello
</jsp:attribute>
<jsp:attribute name="time">
[ <a href="">-1d</a> ] [ <a href="">-2h</a> ] [ <a href="">-1h</a> ] [ <a href="">+1h</a> ] [ <a href="">+2h</a> ] [ <a href="">+1d</a> ]
</jsp:attribute>
<res:useJs value='${res.js.local.mootools_js}' target="head-js" />
<res:useJs value='${res.js.local.jquery_min_js}' target="head-js" />
<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>
<pre>
${model.reportInJson}
</pre>
<jsp:body>
<pre>
${model.reportInJson}
</pre>
</jsp:body>
<table width="100%" border="0" cellpadding="6" cellspacing="0"
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
</a:report>
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或