Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
36d93aad
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,发现更多精彩内容 >>
提交
36d93aad
编写于
3月 23, 2012
作者:
F
Frankie Wu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
adjust cat type and name for model services
上级
1d5c7ed3
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
42 addition
and
50 deletion
+42
-50
cat-consumer/src/main/java/com/dianping/cat/consumer/RealtimeConsumer.java
...main/java/com/dianping/cat/consumer/RealtimeConsumer.java
+1
-1
cat-consumer/src/main/java/com/dianping/cat/consumer/event/EventAnalyzer.java
...n/java/com/dianping/cat/consumer/event/EventAnalyzer.java
+9
-15
cat-consumer/src/main/java/com/dianping/cat/consumer/problem/ProblemAnalyzer.java
...va/com/dianping/cat/consumer/problem/ProblemAnalyzer.java
+9
-15
cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionAnalyzer.java
...ianping/cat/consumer/transaction/TransactionAnalyzer.java
+9
-15
cat-home/src/main/java/com/dianping/cat/report/page/model/spi/internal/BaseCompositeModelService.java
...rt/page/model/spi/internal/BaseCompositeModelService.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/model/spi/internal/BaseHistoricalModelService.java
...t/page/model/spi/internal/BaseHistoricalModelService.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/model/spi/internal/BaseLocalModelService.java
...report/page/model/spi/internal/BaseLocalModelService.java
+1
-1
cat-home/src/main/java/com/dianping/cat/report/page/model/spi/internal/BaseRemoteModelService.java
...eport/page/model/spi/internal/BaseRemoteModelService.java
+1
-1
cat-job/src/main/java/com/dianping/cat/job/storage/RemoteStringBucket.java
...java/com/dianping/cat/job/storage/RemoteStringBucket.java
+10
-0
未找到文件。
cat-consumer/src/main/java/com/dianping/cat/consumer/RealtimeConsumer.java
浏览文件 @
36d93aad
...
...
@@ -127,7 +127,7 @@ public class RealtimeConsumer extends ContainerHolder implements MessageConsumer
public
void
doCheckpoint
()
throws
IOException
{
MessageProducer
cat
=
Cat
.
getProducer
();
Transaction
t
=
cat
.
newTransaction
(
getClass
().
getSimpleName
(),
"checkpoint"
);
Transaction
t
=
cat
.
newTransaction
(
"Checkpoint"
,
getClass
().
getSimpleName
()
);
t
.
setStatus
(
Message
.
SUCCESS
);
...
...
cat-consumer/src/main/java/com/dianping/cat/consumer/event/EventAnalyzer.java
浏览文件 @
36d93aad
...
...
@@ -24,7 +24,6 @@ import com.dianping.cat.consumer.event.model.transform.DefaultXmlBuilder;
import
com.dianping.cat.consumer.event.model.transform.DefaultXmlParser
;
import
com.dianping.cat.message.Event
;
import
com.dianping.cat.message.Message
;
import
com.dianping.cat.message.MessageProducer
;
import
com.dianping.cat.message.Transaction
;
import
com.dianping.cat.message.spi.AbstractMessageAnalyzer
;
import
com.dianping.cat.message.spi.MessagePathBuilder
;
...
...
@@ -78,20 +77,8 @@ public class EventAnalyzer extends AbstractMessageAnalyzer<EventReport> implemen
@Override
public
void
doCheckpoint
()
throws
IOException
{
MessageProducer
cat
=
Cat
.
getProducer
();
Event
t
=
cat
.
newEvent
(
getClass
().
getSimpleName
(),
"checkpoint"
);
try
{
storeReports
(
m_reports
.
values
());
closeMessageBuckets
(
m_reports
.
keySet
());
t
.
setStatus
(
Message
.
SUCCESS
);
}
catch
(
Exception
e
)
{
cat
.
logError
(
e
);
t
.
setStatus
(
e
);
}
finally
{
t
.
complete
();
}
}
@Override
...
...
@@ -308,6 +295,7 @@ public class EventAnalyzer extends AbstractMessageAnalyzer<EventReport> implemen
DefaultXmlBuilder
builder
=
new
DefaultXmlBuilder
(
true
);
Bucket
<
String
>
localBucket
=
null
;
Bucket
<
String
>
remoteBucket
=
null
;
Transaction
t
=
Cat
.
getProducer
().
newTransaction
(
"Checkpoint"
,
getClass
().
getSimpleName
());
try
{
localBucket
=
m_bucketManager
.
getReportBucket
(
timestamp
,
"event"
,
"local"
);
...
...
@@ -323,9 +311,15 @@ public class EventAnalyzer extends AbstractMessageAnalyzer<EventReport> implemen
localBucket
.
storeById
(
domain
,
xml
);
remoteBucket
.
storeById
(
domain
,
xml
);
}
t
.
setStatus
(
Message
.
SUCCESS
);
}
catch
(
Exception
e
)
{
Cat
.
getProducer
().
logError
(
e
);
t
.
setStatus
(
e
);
m_logger
.
error
(
String
.
format
(
"Error when storing event reports of %s!"
,
timestamp
),
e
);
}
finally
{
t
.
complete
();
if
(
localBucket
!=
null
)
{
m_bucketManager
.
closeBucket
(
localBucket
);
}
...
...
cat-consumer/src/main/java/com/dianping/cat/consumer/problem/ProblemAnalyzer.java
浏览文件 @
36d93aad
...
...
@@ -25,7 +25,6 @@ import com.dianping.cat.consumer.problem.model.entity.Segment;
import
com.dianping.cat.consumer.problem.model.transform.DefaultXmlBuilder
;
import
com.dianping.cat.consumer.problem.model.transform.DefaultXmlParser
;
import
com.dianping.cat.message.Message
;
import
com.dianping.cat.message.MessageProducer
;
import
com.dianping.cat.message.Transaction
;
import
com.dianping.cat.message.spi.AbstractMessageAnalyzer
;
import
com.dianping.cat.message.spi.MessageTree
;
...
...
@@ -78,20 +77,8 @@ public class ProblemAnalyzer extends AbstractMessageAnalyzer<ProblemReport> impl
@Override
public
void
doCheckpoint
()
throws
IOException
{
MessageProducer
cat
=
Cat
.
getProducer
();
Transaction
t
=
cat
.
newTransaction
(
getClass
().
getSimpleName
(),
"checkpoint"
);
try
{
storeReports
(
m_reports
.
values
());
closeMessageBuckets
(
m_reports
.
keySet
());
t
.
setStatus
(
Message
.
SUCCESS
);
}
catch
(
Exception
e
)
{
cat
.
logError
(
e
);
t
.
setStatus
(
e
);
}
finally
{
t
.
complete
();
}
}
@Override
...
...
@@ -248,6 +235,7 @@ public class ProblemAnalyzer extends AbstractMessageAnalyzer<ProblemReport> impl
DefaultXmlBuilder
builder
=
new
DefaultXmlBuilder
(
true
);
Bucket
<
String
>
localBucket
=
null
;
Bucket
<
String
>
remoteBucket
=
null
;
Transaction
t
=
Cat
.
getProducer
().
newTransaction
(
"Checkpoint"
,
getClass
().
getSimpleName
());
try
{
localBucket
=
m_bucketManager
.
getReportBucket
(
timestamp
,
"problem"
,
"local"
);
...
...
@@ -263,9 +251,15 @@ public class ProblemAnalyzer extends AbstractMessageAnalyzer<ProblemReport> impl
localBucket
.
storeById
(
domain
,
xml
);
remoteBucket
.
storeById
(
domain
,
xml
);
}
t
.
setStatus
(
Message
.
SUCCESS
);
}
catch
(
Exception
e
)
{
Cat
.
getProducer
().
logError
(
e
);
t
.
setStatus
(
e
);
m_logger
.
error
(
String
.
format
(
"Error when storing problem reports to %s!"
,
timestamp
),
e
);
}
finally
{
t
.
complete
();
if
(
localBucket
!=
null
)
{
m_bucketManager
.
closeBucket
(
localBucket
);
}
...
...
cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionAnalyzer.java
浏览文件 @
36d93aad
...
...
@@ -22,7 +22,6 @@ import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
import
com.dianping.cat.consumer.transaction.model.transform.DefaultXmlBuilder
;
import
com.dianping.cat.consumer.transaction.model.transform.DefaultXmlParser
;
import
com.dianping.cat.message.Message
;
import
com.dianping.cat.message.MessageProducer
;
import
com.dianping.cat.message.Transaction
;
import
com.dianping.cat.message.spi.AbstractMessageAnalyzer
;
import
com.dianping.cat.message.spi.MessagePathBuilder
;
...
...
@@ -76,20 +75,8 @@ public class TransactionAnalyzer extends AbstractMessageAnalyzer<TransactionRepo
@Override
public
void
doCheckpoint
()
throws
IOException
{
MessageProducer
cat
=
Cat
.
getProducer
();
Transaction
t
=
cat
.
newTransaction
(
getClass
().
getSimpleName
(),
"checkpoint"
);
try
{
storeReports
(
m_reports
.
values
());
closeMessageBuckets
(
m_reports
.
keySet
());
t
.
setStatus
(
Message
.
SUCCESS
);
}
catch
(
Exception
e
)
{
cat
.
logError
(
e
);
t
.
setStatus
(
e
);
}
finally
{
t
.
complete
();
}
}
@Override
...
...
@@ -303,6 +290,7 @@ public class TransactionAnalyzer extends AbstractMessageAnalyzer<TransactionRepo
DefaultXmlBuilder
builder
=
new
DefaultXmlBuilder
(
true
);
Bucket
<
String
>
localBucket
=
null
;
Bucket
<
String
>
remoteBucket
=
null
;
Transaction
t
=
Cat
.
getProducer
().
newTransaction
(
"Checkpoint"
,
getClass
().
getSimpleName
());
try
{
localBucket
=
m_bucketManager
.
getReportBucket
(
timestamp
,
"transaction"
,
"local"
);
...
...
@@ -318,9 +306,15 @@ public class TransactionAnalyzer extends AbstractMessageAnalyzer<TransactionRepo
localBucket
.
storeById
(
domain
,
xml
);
remoteBucket
.
storeById
(
domain
,
xml
);
}
t
.
setStatus
(
Message
.
SUCCESS
);
}
catch
(
Exception
e
)
{
Cat
.
getProducer
().
logError
(
e
);
t
.
setStatus
(
e
);
m_logger
.
error
(
String
.
format
(
"Error when storing transaction reports of %s!"
,
timestamp
),
e
);
}
finally
{
t
.
complete
();
if
(
localBucket
!=
null
)
{
m_bucketManager
.
closeBucket
(
localBucket
);
}
...
...
cat-home/src/main/java/com/dianping/cat/report/page/model/spi/internal/BaseCompositeModelService.java
浏览文件 @
36d93aad
...
...
@@ -54,7 +54,7 @@ public abstract class BaseCompositeModelService<T> extends ModelServiceWithCalSu
int
size
=
m_allServices
.
size
();
final
List
<
ModelResponse
<
T
>>
responses
=
new
ArrayList
<
ModelResponse
<
T
>>(
size
);
final
Semaphore
semaphore
=
new
Semaphore
(
0
);
final
Transaction
t
=
Cat
.
getProducer
().
newTransaction
(
getClass
().
getSimpleName
(),
m_name
);
final
Transaction
t
=
Cat
.
getProducer
().
newTransaction
(
"ModelService"
,
getClass
().
getSimpleName
()
);
int
count
=
0
;
t
.
setStatus
(
Message
.
SUCCESS
);
...
...
cat-home/src/main/java/com/dianping/cat/report/page/model/spi/internal/BaseHistoricalModelService.java
浏览文件 @
36d93aad
...
...
@@ -22,7 +22,7 @@ public abstract class BaseHistoricalModelService<T> extends ModelServiceWithCalS
@Override
public
ModelResponse
<
T
>
invoke
(
ModelRequest
request
)
{
ModelResponse
<
T
>
response
=
new
ModelResponse
<
T
>();
Transaction
t
=
newTransaction
(
getClass
().
getSimpleName
(),
m_name
);
Transaction
t
=
newTransaction
(
"ModelService"
,
getClass
().
getSimpleName
()
);
try
{
T
model
=
buildModel
(
request
);
...
...
cat-home/src/main/java/com/dianping/cat/report/page/model/spi/internal/BaseLocalModelService.java
浏览文件 @
36d93aad
...
...
@@ -55,7 +55,7 @@ public class BaseLocalModelService<T> extends ModelServiceWithCalSupport impleme
@Override
public
ModelResponse
<
T
>
invoke
(
ModelRequest
request
)
{
ModelResponse
<
T
>
response
=
new
ModelResponse
<
T
>();
Transaction
t
=
newTransaction
(
getClass
().
getSimpleName
(),
m_name
);
Transaction
t
=
newTransaction
(
"ModelService"
,
getClass
().
getSimpleName
()
);
try
{
T
report
=
getReport
(
request
,
request
.
getPeriod
(),
request
.
getDomain
());
...
...
cat-home/src/main/java/com/dianping/cat/report/page/model/spi/internal/BaseRemoteModelService.java
浏览文件 @
36d93aad
...
...
@@ -60,7 +60,7 @@ public abstract class BaseRemoteModelService<T> extends ModelServiceWithCalSuppo
public
ModelResponse
<
T
>
invoke
(
ModelRequest
request
)
{
ModelResponse
<
T
>
response
=
new
ModelResponse
<
T
>();
MessageProducer
cat
=
Cat
.
getProducer
();
Transaction
t
=
newTransaction
(
getClass
().
getSimpleName
(),
m_name
);
Transaction
t
=
newTransaction
(
"ModelService"
,
getClass
().
getSimpleName
()
);
try
{
URL
url
=
buildUrl
(
request
);
...
...
cat-job/src/main/java/com/dianping/cat/job/storage/RemoteStringBucket.java
浏览文件 @
36d93aad
...
...
@@ -10,9 +10,12 @@ import java.util.List;
import
org.codehaus.plexus.logging.LogEnabled
;
import
org.codehaus.plexus.logging.Logger
;
import
com.dianping.cat.Cat
;
import
com.dianping.cat.job.sql.dal.Report
;
import
com.dianping.cat.job.sql.dal.ReportDao
;
import
com.dianping.cat.job.sql.dal.ReportEntity
;
import
com.dianping.cat.message.Message
;
import
com.dianping.cat.message.Transaction
;
import
com.dianping.cat.storage.Bucket
;
import
com.site.dal.jdbc.DalException
;
import
com.site.lookup.annotation.Inject
;
...
...
@@ -91,19 +94,26 @@ public class RemoteStringBucket implements Bucket<String>, LogEnabled {
@Override
public
boolean
storeById
(
String
domain
,
String
data
)
throws
IOException
{
Transaction
t
=
Cat
.
getProducer
().
newTransaction
(
getClass
().
getSimpleName
(),
"store"
);
Report
report
=
m_reportDao
.
createLocal
();
report
.
setName
(
m_name
);
report
.
setDomain
(
domain
);
report
.
setType
(
1
);
report
.
setContent
(
data
);
report
.
setPeriod
(
m_period
);
t
.
setStatus
(
Message
.
SUCCESS
);
try
{
m_reportDao
.
insert
(
report
);
return
true
;
}
catch
(
DalException
e
)
{
t
.
setStatus
(
e
);
throw
new
IOException
(
String
.
format
(
"Unable to insert report(%s)!"
,
domain
),
e
);
}
finally
{
t
.
complete
();
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录