Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
57a57155
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,发现更多精彩内容 >>
提交
57a57155
编写于
2月 24, 2012
作者:
F
Frankie Wu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add createMessageId() to message producer
上级
2ebd9ca0
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
106 addition
and
20 deletion
+106
-20
cat-consumer/src/test/java/com/dianping/cat/consumer/transaction/GsonTest.java
.../java/com/dianping/cat/consumer/transaction/GsonTest.java
+70
-0
cat-core/src/main/java/com/dianping/cat/Cat.java
cat-core/src/main/java/com/dianping/cat/Cat.java
+5
-2
cat-core/src/main/java/com/dianping/cat/message/MessageProducer.java
...c/main/java/com/dianping/cat/message/MessageProducer.java
+2
-0
cat-core/src/main/java/com/dianping/cat/message/internal/DefaultMessageManager.java
.../dianping/cat/message/internal/DefaultMessageManager.java
+9
-8
cat-core/src/main/java/com/dianping/cat/message/internal/DefaultMessageProducer.java
...dianping/cat/message/internal/DefaultMessageProducer.java
+5
-0
cat-core/src/main/java/com/dianping/cat/message/spi/MessageManager.java
...ain/java/com/dianping/cat/message/spi/MessageManager.java
+13
-7
cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java
.../com/dianping/cat/message/spi/codec/HtmlMessageCodec.java
+1
-1
cat-core/src/test/java/com/dianping/cat/message/spi/codec/HtmlMessageCodecTest.java
.../dianping/cat/message/spi/codec/HtmlMessageCodecTest.java
+0
-1
pom.xml
pom.xml
+1
-1
未找到文件。
cat-consumer/src/test/java/com/dianping/cat/consumer/transaction/GsonTest.java
0 → 100644
浏览文件 @
57a57155
package
com.dianping.cat.consumer.transaction
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.Map
;
import
org.junit.Assert
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
com.google.gson.Gson
;
public
class
GsonTest
{
private
void
check
(
Object
obj
,
String
expected
)
{
String
actual
=
new
Gson
().
toJson
(
obj
);
Assert
.
assertEquals
(
expected
,
actual
);
}
private
Map
<
String
,
Pojo
>
mapOfPojo
()
{
Map
<
String
,
Pojo
>
map
=
new
HashMap
<
String
,
Pojo
>();
map
.
put
(
"first"
,
new
Pojo
(
1
,
"x"
));
map
.
put
(
"second"
,
new
Pojo
(
2
,
"y"
));
map
.
put
(
"third"
,
new
Pojo
(
3
,
"z"
));
return
map
;
}
@Test
public
void
test
()
{
check
(
null
,
""
);
check
(
1
,
"1"
);
check
(
1.2
,
"1.2"
);
check
(
true
,
"true"
);
check
(
"xyz"
,
"\"xyz\""
);
check
(
new
String
[]
{
"x"
,
"y"
},
"[\"x\",\"y\"]"
);
check
(
new
Pojo
(
3
,
null
),
"{\"x\":3}"
);
check
(
new
Pojo
(
3
,
"a"
),
"{\"x\":3,\"y\":\"a\"}"
);
check
(
mapOfPojo
(),
"{\"second\":{\"x\":2,\"y\":\"y\"},"
+
//
"\"third\":{\"x\":3,\"y\":\"z\"},"
+
//
"\"first\":{\"x\":1,\"y\":\"x\"}}"
);
}
@Test
@Ignore
public
void
testOther
()
{
check
(
new
Date
(
1330079278861L
),
"\"2012-02-24 18:27:58\""
);
check
(
Date
.
class
,
"\"class java.util.Date\""
);
}
public
static
class
Pojo
{
private
int
x
;
private
String
y
;
public
Pojo
(
int
x
,
String
y
)
{
this
.
x
=
x
;
this
.
y
=
y
;
}
public
int
getX
()
{
return
x
;
}
public
String
getY
()
{
return
y
;
}
}
}
cat-core/src/main/java/com/dianping/cat/Cat.java
浏览文件 @
57a57155
...
...
@@ -137,7 +137,10 @@ public class Cat {
// this should be called when a thread starts to create some thread local
// data
public
static
void
setup
(
String
sessionToken
)
{
getInstance
().
m_manager
.
setup
();
MessageManager
manager
=
getInstance
().
m_manager
;
manager
.
setup
();
manager
.
getThreadLocalMessageTree
().
setSessionToken
(
sessionToken
);
}
void
setContainer
(
PlexusContainer
container
)
{
...
...
cat-core/src/main/java/com/dianping/cat/message/MessageProducer.java
浏览文件 @
57a57155
...
...
@@ -117,6 +117,8 @@ package com.dianping.cat.message;
* @author Frankie Wu
*/
public
interface
MessageProducer
{
public
String
createMessageId
();
/**
* Log an event in one shot.
*
...
...
cat-core/src/main/java/com/dianping/cat/message/internal/DefaultMessageManager.java
浏览文件 @
57a57155
...
...
@@ -52,6 +52,11 @@ public class DefaultMessageManager extends ContainerHolder implements MessageMan
}
}
@Override
public
String
createMessageId
()
{
return
UUID
.
randomUUID
().
toString
();
// TODO
}
@Override
public
void
enableLogging
(
Logger
logger
)
{
m_logger
=
logger
;
...
...
@@ -146,7 +151,7 @@ public class DefaultMessageManager extends ContainerHolder implements MessageMan
@Override
public
void
start
(
Transaction
transaction
)
{
if
(
Cat
.
isInitialized
())
{
getContext
().
start
(
transaction
);
getContext
().
start
(
t
his
,
t
ransaction
);
}
else
if
(
m_firstMessage
)
{
m_firstMessage
=
false
;
m_logger
.
warn
(
"CAT client is not enabled because it's not initialized yet"
);
...
...
@@ -177,7 +182,7 @@ public class DefaultMessageManager extends ContainerHolder implements MessageMan
MessageTree
tree
=
m_tree
.
copy
();
tree
.
setMessage
(
message
);
tree
.
setMessageId
(
createMessageId
());
tree
.
setMessageId
(
manager
.
createMessageId
());
manager
.
flush
(
tree
);
}
else
{
Transaction
entry
=
m_stack
.
peek
();
...
...
@@ -186,10 +191,6 @@ public class DefaultMessageManager extends ContainerHolder implements MessageMan
}
}
String
createMessageId
()
{
return
UUID
.
randomUUID
().
toString
();
}
public
void
end
(
DefaultMessageManager
manager
,
Transaction
transaction
)
{
if
(!
m_stack
.
isEmpty
())
{
Transaction
current
=
m_stack
.
peek
();
...
...
@@ -211,13 +212,13 @@ public class DefaultMessageManager extends ContainerHolder implements MessageMan
}
}
public
void
start
(
Transaction
transaction
)
{
public
void
start
(
DefaultMessageManager
manager
,
Transaction
transaction
)
{
if
(!
m_stack
.
isEmpty
())
{
Transaction
entry
=
m_stack
.
peek
();
entry
.
addChild
(
transaction
);
}
else
{
m_tree
.
setMessageId
(
createMessageId
());
m_tree
.
setMessageId
(
manager
.
createMessageId
());
m_tree
.
setMessage
(
transaction
);
}
...
...
cat-core/src/main/java/com/dianping/cat/message/internal/DefaultMessageProducer.java
浏览文件 @
57a57155
...
...
@@ -14,6 +14,11 @@ public class DefaultMessageProducer implements MessageProducer {
@Inject
private
MessageManager
m_manager
;
@Override
public
String
createMessageId
()
{
return
m_manager
.
createMessageId
();
}
@Override
public
void
logError
(
Throwable
cause
)
{
StringWriter
writer
=
new
StringWriter
(
2048
);
...
...
cat-core/src/main/java/com/dianping/cat/message/spi/MessageManager.java
浏览文件 @
57a57155
...
...
@@ -14,6 +14,12 @@ import com.dianping.cat.message.Transaction;
public
interface
MessageManager
{
public
void
add
(
Message
message
);
/**
* Create a new message id.
* @return message id
*/
public
String
createMessageId
();
/**
* Be triggered when a transaction ends, whatever it's the root transaction
* or nested transaction. However, if it's the root transaction then it will
...
...
@@ -38,6 +44,13 @@ public interface MessageManager {
*/
public
Config
getServerConfig
();
/**
* Get thread local message information.
*
* @return message tree
*/
public
MessageTree
getThreadLocalMessageTree
();
/**
* Initialize CAT client with given CAT configuration.
*
...
...
@@ -73,11 +86,4 @@ public interface MessageManager {
* @param transaction
*/
public
void
start
(
Transaction
transaction
);
/**
* Get thread local message information.
*
* @return message tree
*/
public
MessageTree
getThreadLocalMessageTree
();
}
\ No newline at end of file
cat-core/src/main/java/com/dianping/cat/message/spi/codec/HtmlMessageCodec.java
浏览文件 @
57a57155
...
...
@@ -30,7 +30,7 @@ public class HtmlMessageCodec implements MessageCodec {
private
BufferWriter
m_writer
;
@Inject
private
String
m_logViewPrefix
;
private
String
m_logViewPrefix
=
"/cat/m/"
;
private
BufferHelper
m_bufferHelper
=
new
BufferHelper
(
m_writer
);
...
...
cat-core/src/test/java/com/dianping/cat/message/spi/codec/HtmlMessageCodecTest.java
浏览文件 @
57a57155
...
...
@@ -25,7 +25,6 @@ public class HtmlMessageCodecTest {
ChannelBuffer
buf
=
ChannelBuffers
.
dynamicBuffer
();
codec
.
setBufferWriter
(
new
HtmlEncodingBufferWriter
());
codec
.
setLogViewPrefix
(
"/cat/m/"
);
codec
.
encodeMessage
(
message
,
buf
,
0
,
null
);
String
actual
=
buf
.
toString
(
Charset
.
forName
(
"utf-8"
));
...
...
pom.xml
浏览文件 @
57a57155
...
...
@@ -33,7 +33,7 @@
<dependency>
<groupId>
com.site.common
</groupId>
<artifactId>
lookup
</artifactId>
<version>
1.0.
1
</version>
<version>
1.0.
2
</version>
</dependency>
<dependency>
<groupId>
junit
</groupId>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录