Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
c662740a
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,发现更多精彩内容 >>
提交
c662740a
编写于
8月 27, 2013
作者:
Y
yong.you
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify the compute score style
上级
b154893c
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
45 addition
and
22 deletion
+45
-22
cat-home/src/main/java/com/dianping/cat/report/page/bug/Handler.java
...c/main/java/com/dianping/cat/report/page/bug/Handler.java
+5
-1
cat-home/src/main/java/com/dianping/cat/report/page/bug/UtilizationReportScore.java
.../dianping/cat/report/page/bug/UtilizationReportScore.java
+27
-11
cat-home/src/main/resources/META-INF/plexus/components.xml
cat-home/src/main/resources/META-INF/plexus/components.xml
+12
-9
cat-home/src/main/webapp/jsp/report/bugTree.jsp
cat-home/src/main/webapp/jsp/report/bugTree.jsp
+1
-1
未找到文件。
cat-home/src/main/java/com/dianping/cat/report/page/bug/Handler.java
浏览文件 @
c662740a
...
@@ -47,6 +47,7 @@ import com.dianping.cat.report.service.ReportService;
...
@@ -47,6 +47,7 @@ import com.dianping.cat.report.service.ReportService;
import
com.dianping.cat.report.task.heavy.HeavyReportMerger.ServiceComparator
;
import
com.dianping.cat.report.task.heavy.HeavyReportMerger.ServiceComparator
;
import
com.dianping.cat.report.task.heavy.HeavyReportMerger.UrlComparator
;
import
com.dianping.cat.report.task.heavy.HeavyReportMerger.UrlComparator
;
import
com.dianping.cat.system.config.BugConfigManager
;
import
com.dianping.cat.system.config.BugConfigManager
;
import
com.dianping.cat.system.config.UtilizationConfigManager
;
public
class
Handler
implements
PageHandler
<
Context
>
{
public
class
Handler
implements
PageHandler
<
Context
>
{
@Inject
@Inject
...
@@ -61,6 +62,9 @@ public class Handler implements PageHandler<Context> {
...
@@ -61,6 +62,9 @@ public class Handler implements PageHandler<Context> {
@Inject
@Inject
private
BugConfigManager
m_bugConfigManager
;
private
BugConfigManager
m_bugConfigManager
;
@Inject
private
UtilizationConfigManager
m_configManager
;
@Inject
@Inject
private
PayloadNormalizer
m_normalizePayload
;
private
PayloadNormalizer
m_normalizePayload
;
...
@@ -225,7 +229,7 @@ public class Handler implements PageHandler<Context> {
...
@@ -225,7 +229,7 @@ public class Handler implements PageHandler<Context> {
private
UtilizationReport
queryUtilizationReport
(
Payload
payload
)
{
private
UtilizationReport
queryUtilizationReport
(
Payload
payload
)
{
Pair
<
Date
,
Date
>
pair
=
queryStartEndTime
(
payload
);
Pair
<
Date
,
Date
>
pair
=
queryStartEndTime
(
payload
);
UtilizationReport
report
=
m_reportService
.
queryUtilizationReport
(
CatString
.
CAT
,
pair
.
getKey
(),
pair
.
getValue
());
UtilizationReport
report
=
m_reportService
.
queryUtilizationReport
(
CatString
.
CAT
,
pair
.
getKey
(),
pair
.
getValue
());
new
UtilizationReportScore
().
visitUtilizationReport
(
report
);
new
UtilizationReportScore
().
setConfigManager
(
m_configManager
).
visitUtilizationReport
(
report
);
return
report
;
return
report
;
}
}
...
...
cat-home/src/main/java/com/dianping/cat/report/page/bug/UtilizationReportScore.java
浏览文件 @
c662740a
package
com.dianping.cat.report.page.bug
;
package
com.dianping.cat.report.page.bug
;
import
com.dianping.cat.home.utilization.config.entity.UtilizationConfig
;
import
com.dianping.cat.home.utilization.entity.Domain
;
import
com.dianping.cat.home.utilization.entity.Domain
;
import
com.dianping.cat.home.utilization.transform.BaseVisitor
;
import
com.dianping.cat.home.utilization.transform.BaseVisitor
;
import
com.dianping.cat.system.config.UtilizationConfigManager
;
public
class
UtilizationReportScore
extends
BaseVisitor
{
public
class
UtilizationReportScore
extends
BaseVisitor
{
private
UtilizationConfigManager
m_configManager
;
private
double
m_callWeight
;
private
double
m_sqlWeight
;
private
double
m_cacheWeight
;
private
double
m_swallWeight
;
@Override
@Override
public
void
visitDomain
(
Domain
domain
)
{
public
void
visitDomain
(
Domain
domain
)
{
long
urlCount
=
domain
.
getUrlCount
();
long
urlCount
=
domain
.
getUrlCount
();
long
serviceCount
=
domain
.
getServiceCount
();
long
serviceCount
=
domain
.
getServiceCount
();
if
(
urlCount
>
0
)
{
if
(
urlCount
>
0
)
{
domain
.
setWebScore
(
compute
Web
Score
(
domain
));
domain
.
setWebScore
(
computeScore
(
domain
));
}
}
if
(
serviceCount
>
0
)
{
if
(
serviceCount
>
0
)
{
domain
.
setServiceScore
(
computeS
erviceS
core
(
domain
));
domain
.
setServiceScore
(
computeScore
(
domain
));
}
}
}
}
private
int
compute
Web
Score
(
Domain
domain
)
{
private
int
computeScore
(
Domain
domain
)
{
long
urlCount
=
domain
.
getUrlCount
();
long
urlCount
=
domain
.
getUrlCount
();
long
serviceCount
=
domain
.
getServiceCount
();
long
cacheCount
=
domain
.
getMemcacheCount
();
long
cacheCount
=
domain
.
getMemcacheCount
();
long
sqlCount
=
domain
.
getSqlCount
();
long
sqlCount
=
domain
.
getSqlCount
();
long
callCount
=
domain
.
getPigeonCallCount
();
long
callCount
=
domain
.
getPigeonCallCount
();
long
swallowCount
=
domain
.
getSwallowCallCount
();
long
swallowCount
=
domain
.
getSwallowCallCount
();
return
(
int
)
((
callCount
*
100
+
sqlCount
*
10
+
cacheCount
+
swallowCount
*
10
)
*
1.0
/
urlCount
);
return
(
int
)
((
callCount
*
m_callWeight
+
sqlCount
*
m_sqlWeight
+
cacheCount
*
m_cacheWeight
+
swallowCount
*
m_swallWeight
)
*
1.0
/
(
urlCount
+
serviceCount
));
}
}
private
int
computeServiceScore
(
Domain
domain
)
{
public
UtilizationReportScore
setConfigManager
(
UtilizationConfigManager
configManager
)
{
m_configManager
=
configManager
;
long
serviceCount
=
domain
.
getServiceCount
();
UtilizationConfig
utilizationConfig
=
m_configManager
.
getUtilizationConfig
();
long
cacheCount
=
domain
.
getMemcacheCoun
t
();
m_callWeight
=
utilizationConfig
.
getPigeoncallWeigh
t
();
long
sqlCount
=
domain
.
getSqlCoun
t
();
m_sqlWeight
=
utilizationConfig
.
getSqlWeigh
t
();
long
callCount
=
domain
.
getPigeonCallCoun
t
();
m_cacheWeight
=
utilizationConfig
.
getCacheWeigh
t
();
long
swallowCount
=
domain
.
getSwallowCallCoun
t
();
m_swallWeight
=
utilizationConfig
.
getSwallowWeigh
t
();
return
(
int
)
((
callCount
*
100
+
sqlCount
*
10
+
cacheCount
+
swallowCount
*
10
)
*
1.0
/
serviceCount
)
;
return
this
;
}
}
}
}
cat-home/src/main/resources/META-INF/plexus/components.xml
浏览文件 @
c662740a
...
@@ -2767,6 +2767,9 @@
...
@@ -2767,6 +2767,9 @@
<requirement>
<requirement>
<role>
com.dianping.cat.system.config.BugConfigManager
</role>
<role>
com.dianping.cat.system.config.BugConfigManager
</role>
</requirement>
</requirement>
<requirement>
<role>
com.dianping.cat.system.config.UtilizationConfigManager
</role>
</requirement>
<requirement>
<requirement>
<role>
com.dianping.cat.report.page.PayloadNormalizer
</role>
<role>
com.dianping.cat.report.page.PayloadNormalizer
</role>
</requirement>
</requirement>
...
@@ -2790,6 +2793,15 @@
...
@@ -2790,6 +2793,15 @@
</requirement>
</requirement>
</requirements>
</requirements>
</component>
</component>
<component>
<role>
com.dianping.cat.system.config.UtilizationConfigManager
</role>
<implementation>
com.dianping.cat.system.config.UtilizationConfigManager
</implementation>
<requirements>
<requirement>
<role>
com.dianping.cat.core.config.ConfigDao
</role>
</requirement>
</requirements>
</component>
<component>
<component>
<role>
com.dianping.cat.system.SystemModule
</role>
<role>
com.dianping.cat.system.SystemModule
</role>
<implementation>
com.dianping.cat.system.SystemModule
</implementation>
<implementation>
com.dianping.cat.system.SystemModule
</implementation>
...
@@ -3060,15 +3072,6 @@
...
@@ -3060,15 +3072,6 @@
</requirement>
</requirement>
</requirements>
</requirements>
</component>
</component>
<component>
<role>
com.dianping.cat.system.config.UtilizationConfigManager
</role>
<implementation>
com.dianping.cat.system.config.UtilizationConfigManager
</implementation>
<requirements>
<requirement>
<role>
com.dianping.cat.core.config.ConfigDao
</role>
</requirement>
</requirements>
</component>
<component>
<component>
<role>
com.dianping.cat.system.page.abtest.Handler
</role>
<role>
com.dianping.cat.system.page.abtest.Handler
</role>
<implementation>
com.dianping.cat.system.page.abtest.Handler
</implementation>
<implementation>
com.dianping.cat.system.page.abtest.Handler
</implementation>
...
...
cat-home/src/main/webapp/jsp/report/bugTree.jsp
浏览文件 @
c662740a
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<li
class=
'nav-header'
><h4>
Statistics
</h4></li>
<li
class=
'nav-header'
><h4>
Statistics
</h4></li>
<li
id=
"bug"
class=
"text-right "
id=
"bug"
><a
href=
"?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&op=view"
><strong>
项目异常
</strong></a></li>
<li
id=
"bug"
class=
"text-right "
id=
"bug"
><a
href=
"?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&op=view"
><strong>
项目异常
</strong></a></li>
<li
id=
"service"
class=
"text-right"
id=
"service"
><a
href=
"?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&op=service"
><strong>
服务可用性
</strong></a></li>
<li
id=
"service"
class=
"text-right"
id=
"service"
><a
href=
"?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&op=service"
><strong>
服务可用性
</strong></a></li>
<li
id=
"utilization"
class=
"text-right"
id=
"service"
><a
href=
"?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&op=utilization"
><strong>
应用
节能
排行榜
</strong></a></li>
<li
id=
"utilization"
class=
"text-right"
id=
"service"
><a
href=
"?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&op=utilization"
><strong>
应用排行榜
</strong></a></li>
<li
id=
"heavy"
class=
"text-right"
id=
"heavy"
><a
href=
"?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&op=heavy"
><strong>
重量级访问
</strong></a></li>
<li
id=
"heavy"
class=
"text-right"
id=
"heavy"
><a
href=
"?domain=${model.domain}&ip=${model.ipAddress}&date=${model.date}&op=heavy"
><strong>
重量级访问
</strong></a></li>
</ul>
</ul>
</div>
</div>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录