Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
e9d14670
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,发现更多精彩内容 >>
提交
e9d14670
编写于
3月 06, 2012
作者:
F
Frankie Wu
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
ssh://192.168.8.22:58422/cat
上级
741a17f9
5b8a62c1
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
45 addition
and
48 deletion
+45
-48
cat-consumer/src/main/java/com/dianping/cat/consumer/failure/FailureReportAnalyzer.java
.../dianping/cat/consumer/failure/FailureReportAnalyzer.java
+2
-2
cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionReportAnalyzer.java
...g/cat/consumer/transaction/TransactionReportAnalyzer.java
+0
-2
cat-core/src/main/java/com/dianping/cat/servlet/CatFilter.java
...ore/src/main/java/com/dianping/cat/servlet/CatFilter.java
+0
-7
cat-core/src/test/java/META-INF/MANIFEST.MF
cat-core/src/test/java/META-INF/MANIFEST.MF
+3
-0
cat-home/src/main/java/com/dianping/cat/report/ReportManager.java
.../src/main/java/com/dianping/cat/report/ReportManager.java
+0
-2
cat-home/src/main/java/com/dianping/cat/report/page/service/provider/TransactionModelProvider.java
...eport/page/service/provider/TransactionModelProvider.java
+6
-1
cat-home/src/main/webapp/WEB-INF/webres.tld
cat-home/src/main/webapp/WEB-INF/webres.tld
+34
-34
未找到文件。
cat-consumer/src/main/java/com/dianping/cat/consumer/failure/FailureReportAnalyzer.java
浏览文件 @
e9d14670
...
...
@@ -179,8 +179,8 @@ public class FailureReportAnalyzer extends AbstractMessageAnalyzer<FailureReport
}
}
oldSegments
.
clear
();
for
(
String
key
:
newSegments
.
ke
ySet
())
{
oldSegments
.
put
(
key
,
newSegments
.
get
(
key
));
for
(
java
.
util
.
Map
.
Entry
<
String
,
Segment
>
entry
:
newSegments
.
entr
ySet
())
{
oldSegments
.
put
(
entry
.
getKey
(),
newSegments
.
get
(
entry
.
getValue
()
));
}
return
m_report
;
}
...
...
cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionReportAnalyzer.java
浏览文件 @
e9d14670
...
...
@@ -222,8 +222,6 @@ public class TransactionReportAnalyzer extends AbstractMessageAnalyzer<Transacti
@Override
protected
void
process
(
MessageTree
tree
)
{
//TO delete it , it should be delete after test
messageStorage
.
store
(
tree
);
String
domain
=
tree
.
getDomain
();
TransactionReport
report
=
this
.
m_reports
.
get
(
domain
);
if
(
report
==
null
)
{
...
...
cat-core/src/main/java/com/dianping/cat/servlet/CatFilter.java
浏览文件 @
e9d14670
...
...
@@ -28,7 +28,6 @@ public abstract class CatFilter implements Filter {
String
sessionToken
=
req
.
getSession
().
getId
();
// setup for thread local data
Cat
.
setup
(
sessionToken
);
System
.
out
.
println
(
"----------------Cat Filter init----------------"
);
MessageProducer
cat
=
Cat
.
getProducer
();
Transaction
t
=
cat
.
newTransaction
(
"URL"
,
req
.
getRequestURI
());
...
...
@@ -40,21 +39,15 @@ public abstract class CatFilter implements Filter {
chain
.
doFilter
(
request
,
response
);
}
catch
(
ServletException
e
)
{
t
.
setStatus
(
e
);
throw
e
;
}
catch
(
IOException
e
)
{
t
.
setStatus
(
e
);
throw
e
;
}
catch
(
RuntimeException
e
)
{
t
.
setStatus
(
e
);
throw
e
;
}
finally
{
t
.
complete
();
System
.
out
.
println
(
"----------------Cat Filter End----------------"
);
// reset thread local data
Cat
.
reset
();
}
}
...
...
cat-core/src/test/java/META-INF/MANIFEST.MF
0 → 100644
浏览文件 @
e9d14670
Manifest-Version: 1.0
Class-Path:
cat-home/src/main/java/com/dianping/cat/report/ReportManager.java
浏览文件 @
e9d14670
...
...
@@ -47,8 +47,6 @@ public abstract class ReportManager {
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
}
else
{
inputStart
=
DateUtils
.
SDF_URL
.
format
(
currentHourStart
);
}
long
reportStart
=
startLong
+
changeValue
*
DateUtils
.
HOUR
;
...
...
cat-home/src/main/java/com/dianping/cat/report/page/service/provider/TransactionModelProvider.java
浏览文件 @
e9d14670
...
...
@@ -51,8 +51,13 @@ public class TransactionModelProvider implements ModelProvider {
}
else
{
System
.
err
.
println
(
"historical model is not implemented yet"
);
}
TransactionReport
report
;
TransactionReport
report
=
analyzer
.
generate
(
domain
);
if
(
analyzer
==
null
)
{
report
=
new
TransactionReport
(
domain
);
}
else
{
report
=
analyzer
.
generate
(
domain
);
}
return
new
DefaultXmlBuilder
().
buildXml
(
report
);
}
...
...
cat-home/src/main/webapp/WEB-INF/webres.tld
浏览文件 @
e9d14670
...
...
@@ -51,13 +51,6 @@
<tag-class>org.unidal.webres.taglib.basic.UseCssTagHandler</tag-class>
<body-content>JSP</body-content>
<attribute>
<description><![CDATA[Set the css value with EL or a css ref.]]></description>
<name>value</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Object</type>
</attribute>
<attribute>
<description><![CDATA[Identify whether the link URL is secure or not.]]></description>
<name>secure</name>
<required>false</required>
...
...
@@ -79,6 +72,13 @@
<type>java.lang.String</type>
</attribute>
<attribute>
<description><![CDATA[Set the css value with EL or a css ref.]]></description>
<name>value</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Object</type>
</attribute>
<attribute>
<description><![CDATA[Target placement for this css resource to render]]></description>
<name>target</name>
<required>false</required>
...
...
@@ -114,18 +114,18 @@
<tag-class>org.unidal.webres.taglib.basic.SetTagHandler</tag-class>
<body-content>JSP</body-content>
<attribute>
<description><![CDATA[The
value
]]></description>
<name>
value
</name>
<description><![CDATA[The
name.
]]></description>
<name>
id
</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.
Object
</type>
<type>java.lang.
String
</type>
</attribute>
<attribute>
<description><![CDATA[The
name.
]]></description>
<name>
id
</name>
<description><![CDATA[The
value
]]></description>
<name>
value
</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.
String
</type>
<type>java.lang.
Object
</type>
</attribute>
<dynamic-attributes>false</dynamic-attributes>
</tag>
...
...
@@ -135,13 +135,6 @@
<tag-class>org.unidal.webres.taglib.basic.UseJsTagHandler</tag-class>
<body-content>JSP</body-content>
<attribute>
<description><![CDATA[Set the js value with EL or a js ref.]]></description>
<name>value</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Object</type>
</attribute>
<attribute>
<description><![CDATA[Identify whether the link URL is secure or not.]]></description>
<name>secure</name>
<required>false</required>
...
...
@@ -163,6 +156,13 @@
<type>java.lang.String</type>
</attribute>
<attribute>
<description><![CDATA[Set the js value with EL or a js ref.]]></description>
<name>value</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Object</type>
</attribute>
<attribute>
<description><![CDATA[Target placement for this js resource to render]]></description>
<name>target</name>
<required>false</required>
...
...
@@ -177,13 +177,6 @@
<tag-class>org.unidal.webres.taglib.basic.LinkTagHandler</tag-class>
<body-content>JSP</body-content>
<attribute>
<description><![CDATA[The value for link, could be a expression or a link ref.]]></description>
<name>value</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Object</type>
</attribute>
<attribute>
<description><![CDATA[Identify whether the link URL is secure or not.]]></description>
<name>secure</name>
<required>false</required>
...
...
@@ -197,6 +190,13 @@
<rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<description><![CDATA[The value for link, could be a expression or a link ref.]]></description>
<name>value</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Object</type>
</attribute>
<dynamic-attributes>true</dynamic-attributes>
</tag>
<tag>
...
...
@@ -205,13 +205,6 @@
<tag-class>org.unidal.webres.taglib.basic.ImageTagHandler</tag-class>
<body-content>JSP</body-content>
<attribute>
<description><![CDATA[The value for image, could be a expression or a image path.]]></description>
<name>value</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Object</type>
</attribute>
<attribute>
<description><![CDATA[Identify whether the image URL is secure or not.]]></description>
<name>secure</name>
<required>false</required>
...
...
@@ -232,6 +225,13 @@
<rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<description><![CDATA[The value for image, could be a expression or a image path.]]></description>
<name>value</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Object</type>
</attribute>
<dynamic-attributes>true</dynamic-attributes>
</tag>
<tag>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录