Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
a55404d7
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,发现更多精彩内容 >>
提交
a55404d7
编写于
7月 29, 2014
作者:
Y
youyong205
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify the router page and fix js error
上级
bc8846b6
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
21 addition
and
24 deletion
+21
-24
cat-client/src/main/java/com/dianping/cat/message/io/TcpSocketSender.java
...ain/java/com/dianping/cat/message/io/TcpSocketSender.java
+0
-3
cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java
...ain/java/com/dianping/cat/system/page/router/Handler.java
+1
-2
cat-home/src/main/webapp/jsp/report/dependency/dependencyDashboard.jsp
...main/webapp/jsp/report/dependency/dependencyDashboard.jsp
+11
-10
cat-home/src/main/webapp/jsp/report/dependency/metricDashboard.jsp
...src/main/webapp/jsp/report/dependency/metricDashboard.jsp
+8
-8
cat-home/src/main/webapp/jsp/system/router/router.jsp
cat-home/src/main/webapp/jsp/system/router/router.jsp
+1
-1
未找到文件。
cat-client/src/main/java/com/dianping/cat/message/io/TcpSocketSender.java
浏览文件 @
a55404d7
...
...
@@ -95,8 +95,6 @@ public class TcpSocketSender implements Task, MessageSender, LogEnabled {
MessageTree
tree
=
m_queue
.
poll
();
if
(
tree
!=
null
)
{
System
.
out
.
println
(
"write to===="
+
future
.
getChannel
().
getRemoteAddress
());
sendInternal
(
tree
);
tree
.
setMessage
(
null
);
}
...
...
@@ -104,7 +102,6 @@ public class TcpSocketSender implements Task, MessageSender, LogEnabled {
m_logger
.
error
(
"Error when sending message over TCP socket!"
,
t
);
}
}
else
{
System
.
out
.
println
(
"channel can't write"
);
try
{
Thread
.
sleep
(
5
);
}
catch
(
Exception
e
)
{
...
...
cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java
浏览文件 @
a55404d7
...
...
@@ -74,9 +74,8 @@ public class Handler implements PageHandler<Context> {
if
(
report
!=
null
)
{
model
.
setContent
(
report
.
toString
());
}
break
;
}
model
.
setAction
(
Action
.
API
);
model
.
setAction
(
action
);
model
.
setPage
(
SystemPage
.
ROUTER
);
if
(!
ctx
.
isProcessStopped
())
{
...
...
cat-home/src/main/webapp/jsp/report/dependency/dependencyDashboard.jsp
浏览文件 @
a55404d7
...
...
@@ -8,16 +8,6 @@
<jsp:useBean
id=
"model"
type=
"com.dianping.cat.report.page.dependency.Model"
scope=
"request"
/>
<res:bean
id=
"res"
/>
<res:useCss
value=
'
${
res
.
css
.
local
.
table_css
}
'
target=
"head-css"
/>
<res:useCss
value=
'
${
res
.
css
.
local
.
body_css
}
'
target=
"head-css"
/>
<res:useCss
value=
"
${
res
.
css
.
local
[
'bootstrap.css'
]
}
"
target=
"head-css"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery-1.7.1.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'bootstrap.min.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery.dataTables.min.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'startopo.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'raphael-min.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'dependencyConfig.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery.validate.min.js'
]
}
"
target=
"head-js"
/>
<style>
.tooltip-inner
{
max-width
:
36555px
;
...
...
@@ -31,6 +21,16 @@
</style>
<c:choose>
<c:when
test=
"
${
payload
.
fullScreen
}
"
>
<res:useCss
value=
'
${
res
.
css
.
local
.
table_css
}
'
target=
"head-css"
/>
<res:useCss
value=
'
${
res
.
css
.
local
.
body_css
}
'
target=
"head-css"
/>
<res:useCss
value=
"
${
res
.
css
.
local
[
'bootstrap.css'
]
}
"
target=
"head-css"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery-1.7.1.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'bootstrap.min.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery.dataTables.min.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'raphael-min.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'dependencyConfig.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery.validate.min.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'startopo.js'
]
}
"
target=
"head-js"
/>
<div
class=
"report"
>
<a
href=
"javascript:showOpNav()"
id=
"switch"
class=
"btn btn-small btn-success"
>
隐藏
</a>
<div
class=
"opNav"
>
...
...
@@ -46,6 +46,7 @@
</div>
</c:when>
<c:otherwise>
<res:useJs
value=
"
${
res
.
js
.
local
[
'startopo.js'
]
}
"
target=
"head-js"
/>
<a:report
title=
"Dependency Report"
navUrlPrefix=
"domain=${model.domain}&op=dashboard"
>
<jsp:attribute
name=
"subtitle"
>
From ${w:format(model.reportStart,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.reportEnd,'yyyy-MM-dd HH:mm:ss')}
</jsp:attribute>
...
...
cat-home/src/main/webapp/jsp/report/dependency/metricDashboard.jsp
浏览文件 @
a55404d7
...
...
@@ -7,14 +7,6 @@
<jsp:useBean
id=
"payload"
type=
"com.dianping.cat.report.page.dependency.Payload"
scope=
"request"
/>
<jsp:useBean
id=
"model"
type=
"com.dianping.cat.report.page.dependency.Model"
scope=
"request"
/>
<res:bean
id=
"res"
/>
<res:useCss
value=
'
${
res
.
css
.
local
.
table_css
}
'
target=
"head-css"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'dependencyConfig.js'
]
}
"
target=
"head-js"
/>
<res:useCss
value=
'
${
res
.
css
.
local
.
body_css
}
'
target=
"head-css"
/>
<res:useCss
value=
"
${
res
.
css
.
local
[
'bootstrap.css'
]
}
"
target=
"head-css"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery-1.7.1.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'bootstrap.min.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'baseGraph.js'
]
}
"
target=
"head-js"
/>
<style>
.tooltip-inner
{
...
...
@@ -29,6 +21,14 @@
</style>
<c:choose>
<c:when
test=
"
${
payload
.
fullScreen
}
"
>
<res:bean
id=
"res"
/>
<res:useCss
value=
'
${
res
.
css
.
local
.
table_css
}
'
target=
"head-css"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'dependencyConfig.js'
]
}
"
target=
"head-js"
/>
<res:useCss
value=
'
${
res
.
css
.
local
.
body_css
}
'
target=
"head-css"
/>
<res:useCss
value=
"
${
res
.
css
.
local
[
'bootstrap.css'
]
}
"
target=
"head-css"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'jquery-1.7.1.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'bootstrap.min.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'baseGraph.js'
]
}
"
target=
"head-js"
/>
<res:useJs
value=
"
${
res
.
js
.
local
[
'highcharts.js'
]
}
"
target=
"head-js"
/>
<div
class=
"report"
>
<a
href=
"javascript:showOpNav()"
id=
"switch"
class=
"btn btn-small btn-success"
>
隐藏
</a>
...
...
cat-home/src/main/webapp/jsp/system/router/router.jsp
浏览文件 @
a55404d7
<%@ page
contentType=
"text/
html; charset=utf-8
"
%>
<%@ page
contentType=
"text/
xml; charset=utf-8"
trimDirectiveWhitespaces=
"true
"
%>
<jsp:useBean
id=
"model"
type=
"com.dianping.cat.system.page.router.Model"
scope=
"request"
/>
${model.content}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录