Skip to content

C
cat

梦中观雨 / cat
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

体验新版 GitCode，发现更多精彩内容 >>

提交 3487e703 编写于 作者: F Frankie Wu
浏览文件
操作

merge

上级 168b91bf
隐藏空白更改
内联 并排
Showing with 125 addition and 63 deletion
cat-consumer/src/main/java/com/dianping/cat/consumer/event/EventAnalyzer.java
浏览文件 @ 3487e703
......@@ -173,21 +173,7 @@ public class EventAnalyzer extends AbstractMessageAnalyzer<EventReport> implemen
// the message is required by some events
if (count > 0) {
String messageId = tree.getMessageId();
Transaction t = Cat.getProducer().newTransaction("MessageProcess", getClass().getSimpleName());
t.setStatus(Message.SUCCESS);
try {
Bucket<MessageTree> localBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "local");
Bucket<MessageTree> remoteBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "remote");
localBucket.storeById(messageId, tree);
remoteBucket.storeById(messageId, tree);
} catch (IOException e) {
m_logger.error("Error when storing message for event analyzer!", e);
} finally {
t.complete();
}
storeMessage(tree);
}
}
......
cat-consumer/src/main/java/com/dianping/cat/consumer/problem/ProblemAnalyzer.java
浏览文件 @ 3487e703
......@@ -92,7 +92,7 @@ public class ProblemAnalyzer extends AbstractMessageAnalyzer<ProblemReport> impl
Machine machine = report.findOrCreateMachine(tree.getIpAddress());
JavaThread thread = machine.findOrCreateThread(tree.getThreadId());
thread.setGroupName(tree.getThreadGroupName()).setName(tree.getThreadName());
Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(tree.getMessage().getTimestamp());
......@@ -183,21 +183,7 @@ public class ProblemAnalyzer extends AbstractMessageAnalyzer<ProblemReport> impl
}
if (count > 0) {
String messageId = tree.getMessageId();
Transaction t = Cat.getProducer().newTransaction("MessageProcess", getClass().getSimpleName());
t.setStatus(Message.SUCCESS);
try {
Bucket<MessageTree> localBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "local");
Bucket<MessageTree> remoteBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "remote");
localBucket.storeById(messageId, tree);
remoteBucket.storeById(messageId, tree);
} catch (IOException e) {
m_logger.error("Error when storing message for problem analyzer!", e);
} finally {
t.complete();
}
storeMessage(tree);
}
}
......@@ -238,7 +224,7 @@ public class ProblemAnalyzer extends AbstractMessageAnalyzer<ProblemReport> impl
remoteBucket.storeById(messageId, tree);
}
} catch (IOException e) {
} catch (Exception e) {
m_logger.error("Error when storing message for problem analyzer!", e);
}
}
......
cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionAnalyzer.java
浏览文件 @ 3487e703
......@@ -169,22 +169,7 @@ public class TransactionAnalyzer extends AbstractMessageAnalyzer<TransactionRepo
// the message is required by some transactions
if (count > 0) {
String messageId = tree.getMessageId();
Transaction t = Cat.getProducer().newTransaction("MessageProcess", getClass().getSimpleName());
t.setStatus(Message.SUCCESS);
try {
Bucket<MessageTree> localBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "local");
Bucket<MessageTree> remoteBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "remote");
localBucket.storeById(messageId, tree);
remoteBucket.storeById(messageId, tree);
} catch (IOException e) {
// we don't let transaction status to fail to avoid message storm
m_logger.error("Error when storing message for transaction analyzer!", e);
} finally {
t.complete();
}
storeMessage(tree);
}
}
}
......
cat-home/dump/20120327/10/message-Cat-192.168.63.64 0 → 100755
浏览文件 @ 3487e703
PT1 Cat FrankiematoMacBook-Air.local 192.168.63.64 main 38 btpool0-2 Cat-c0a83f40-1332816447591-0 null null null
t2012-03-27 10:47:27.591 URL t
E2012-03-27 10:47:27.591 URL ClientInfo 0 RemoteIP=fe80:0:0:0:0:0:0:1%1&Server=localhost&Referer=http://localhost:2281/cat/r/m/Cat-c0a83f40-1332816349195-0/logview.html?tag2=t:29&Agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.53.11 (KHTML, like Gecko) Version/5.1.3 Safari/534.53.10
E2012-03-27 10:47:27.591 URL Payload 0 HTTP/GET /cat/r/t
A2012-03-27 10:47:27.591 MVC InboundPhase 0 0ms
A2012-03-27 10:47:27.591 MVC TransitionPhase 0 0ms
t2012-03-27 10:47:27.591 MVC OutboundPhase
A2012-03-27 10:47:27.591 ModelService CompositeTransactionService 0 0ms request=ModelRequest[domain=Cat, period=CURRENT, properties={type=null, date=1332813600000}]
T2012-03-27 10:47:27.601 MVC OutboundPhase 0 10ms
T2012-03-27 10:47:27.601 URL t 0 10ms module=r&in=t&out=t
PT1 Cat FrankiematoMacBook-Air.local 192.168.63.64 main 38 btpool0-2 Cat-c0a83f40-1332816448574-0 null null null
t2012-03-27 10:47:28.574 URL p
E2012-03-27 10:47:28.574 URL ClientInfo 0 RemoteIP=fe80:0:0:0:0:0:0:1%1&Server=localhost&Referer=http://localhost:2281/cat/r/t&Agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.53.11 (KHTML, like Gecko) Version/5.1.3 Safari/534.53.10
E2012-03-27 10:47:28.574 URL Payload 0 HTTP/GET /cat/r/p
A2012-03-27 10:47:28.574 MVC InboundPhase 0 1ms
A2012-03-27 10:47:28.575 MVC TransitionPhase 0 0ms
t2012-03-27 10:47:28.575 MVC OutboundPhase
A2012-03-27 10:47:28.575 ModelService CompositeProblemService 0 0ms request=ModelRequest[domain=Cat, period=CURRENT, properties={thread=192.168.63.64, date=1332813600000, ip=192.168.63.64}]
T2012-03-27 10:47:28.586 MVC OutboundPhase 0 11ms
T2012-03-27 10:47:28.586 URL p 0 12ms module=r&in=p&out=p
PT1 Cat FrankiematoMacBook-Air.local 192.168.63.64 main 38 btpool0-2 Cat-c0a83f40-1332816449411-0 null null null
t2012-03-27 10:47:29.411 URL p
E2012-03-27 10:47:29.411 URL ClientInfo 0 RemoteIP=fe80:0:0:0:0:0:0:1%1&Server=localhost&Referer=http://localhost:2281/cat/r/p&Agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.53.11 (KHTML, like Gecko) Version/5.1.3 Safari/534.53.10
E2012-03-27 10:47:29.411 URL Payload 0 HTTP/GET /cat/r/p
A2012-03-27 10:47:29.411 MVC InboundPhase 0 0ms
A2012-03-27 10:47:29.411 MVC TransitionPhase 0 0ms
t2012-03-27 10:47:29.411 MVC OutboundPhase
A2012-03-27 10:47:29.411 ModelService CompositeProblemService 0 2ms request=ModelRequest[domain=Cat, period=CURRENT, properties={thread=192.168.63.64, date=1332813600000, ip=192.168.63.64}]
T2012-03-27 10:47:29.425 MVC OutboundPhase 0 14ms
T2012-03-27 10:47:29.425 URL p 0 14ms module=r&in=p&out=p
PT1 Cat FrankiematoMacBook-Air.local 192.168.63.64 main 38 btpool0-2 Cat-c0a83f40-1332816449836-0 null null null
t2012-03-27 10:47:29.836 URL p
E2012-03-27 10:47:29.836 URL ClientInfo 0 RemoteIP=fe80:0:0:0:0:0:0:1%1&Server=localhost&Referer=http://localhost:2281/cat/r/p&Agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.53.11 (KHTML, like Gecko) Version/5.1.3 Safari/534.53.10
E2012-03-27 10:47:29.836 URL Payload 0 HTTP/GET /cat/r/p
A2012-03-27 10:47:29.836 MVC InboundPhase 0 0ms
A2012-03-27 10:47:29.836 MVC TransitionPhase 0 0ms
t2012-03-27 10:47:29.836 MVC OutboundPhase
A2012-03-27 10:47:29.837 ModelService CompositeProblemService 0 0ms request=ModelRequest[domain=Cat, period=CURRENT, properties={thread=192.168.63.64, date=1332813600000, ip=192.168.63.64}]
T2012-03-27 10:47:29.850 MVC OutboundPhase 0 14ms
T2012-03-27 10:47:29.850 URL p 0 14ms module=r&in=p&out=p
PT1 Cat FrankiematoMacBook-Air.local 192.168.63.64 main 38 btpool0-2 Cat-c0a83f40-1332816450052-0 null null null
t2012-03-27 10:47:30.052 URL p
E2012-03-27 10:47:30.052 URL ClientInfo 0 RemoteIP=fe80:0:0:0:0:0:0:1%1&Server=localhost&Referer=http://localhost:2281/cat/r/p&Agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.53.11 (KHTML, like Gecko) Version/5.1.3 Safari/534.53.10
E2012-03-27 10:47:30.052 URL Payload 0 HTTP/GET /cat/r/p
A2012-03-27 10:47:30.052 MVC InboundPhase 0 0ms
A2012-03-27 10:47:30.052 MVC TransitionPhase 0 0ms
t2012-03-27 10:47:30.052 MVC OutboundPhase
A2012-03-27 10:47:30.052 ModelService CompositeProblemService 0 1ms request=ModelRequest[domain=Cat, period=CURRENT, properties={thread=192.168.63.64, date=1332813600000, ip=192.168.63.64}]
T2012-03-27 10:47:30.064 MVC OutboundPhase 0 12ms
T2012-03-27 10:47:30.064 URL p 0 12ms module=r&in=p&out=p
PT1 Cat FrankiematoMacBook-Air.local 192.168.63.64 main 38 btpool0-2 Cat-c0a83f40-1332816450284-0 null null null
t2012-03-27 10:47:30.284 URL p
E2012-03-27 10:47:30.284 URL ClientInfo 0 RemoteIP=fe80:0:0:0:0:0:0:1%1&Server=localhost&Referer=http://localhost:2281/cat/r/p&Agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.53.11 (KHTML, like Gecko) Version/5.1.3 Safari/534.53.10
E2012-03-27 10:47:30.284 URL Payload 0 HTTP/GET /cat/r/p
A2012-03-27 10:47:30.284 MVC InboundPhase 0 0ms
A2012-03-27 10:47:30.284 MVC TransitionPhase 0 0ms
t2012-03-27 10:47:30.284 MVC OutboundPhase
A2012-03-27 10:47:30.284 ModelService CompositeProblemService 0 0ms request=ModelRequest[domain=Cat, period=CURRENT, properties={thread=192.168.63.64, date=1332813600000, ip=192.168.63.64}]
T2012-03-27 10:47:30.292 MVC OutboundPhase 0 8ms
T2012-03-27 10:47:30.292 URL p 0 8ms module=r&in=p&out=p
PT1 Cat FrankiematoMacBook-Air.local 192.168.63.64 main 38 btpool0-2 Cat-c0a83f40-1332816450601-0 null null null
t2012-03-27 10:47:30.601 URL p
E2012-03-27 10:47:30.601 URL ClientInfo 0 RemoteIP=fe80:0:0:0:0:0:0:1%1&Server=localhost&Referer=http://localhost:2281/cat/r/p&Agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.53.11 (KHTML, like Gecko) Version/5.1.3 Safari/534.53.10
E2012-03-27 10:47:30.601 URL Payload 0 HTTP/GET /cat/r/p
A2012-03-27 10:47:30.601 MVC InboundPhase 0 1ms
A2012-03-27 10:47:30.602 MVC TransitionPhase 0 0ms
t2012-03-27 10:47:30.602 MVC OutboundPhase
A2012-03-27 10:47:30.602 ModelService CompositeProblemService 0 0ms request=ModelRequest[domain=Cat, period=CURRENT, properties={thread=192.168.63.64, date=1332813600000, ip=192.168.63.64}]
T2012-03-27 10:47:30.619 MVC OutboundPhase 0 17ms
T2012-03-27 10:47:30.619 URL p 0 18ms module=r&in=p&out=p
PT1 Cat FrankiematoMacBook-Air.local 192.168.63.64 main 38 btpool0-2 Cat-c0a83f40-1332816450790-0 null null null
t2012-03-27 10:47:30.790 URL p
E2012-03-27 10:47:30.790 URL ClientInfo 0 RemoteIP=fe80:0:0:0:0:0:0:1%1&Server=localhost&Referer=http://localhost:2281/cat/r/p&Agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.53.11 (KHTML, like Gecko) Version/5.1.3 Safari/534.53.10
E2012-03-27 10:47:30.790 URL Payload 0 HTTP/GET /cat/r/p
A2012-03-27 10:47:30.790 MVC InboundPhase 0 0ms
A2012-03-27 10:47:30.790 MVC TransitionPhase 0 0ms
t2012-03-27 10:47:30.790 MVC OutboundPhase
A2012-03-27 10:47:30.790 ModelService CompositeProblemService 0 1ms request=ModelRequest[domain=Cat, period=CURRENT, properties={thread=192.168.63.64, date=1332813600000, ip=192.168.63.64}]
T2012-03-27 10:47:30.799 MVC OutboundPhase 0 9ms
T2012-03-27 10:47:30.799 URL p 0 9ms module=r&in=p&out=p
PT1 Cat FrankiematoMacBook-Air.local 192.168.63.64 main 38 btpool0-2 Cat-c0a83f40-1332816450977-0 null null null
t2012-03-27 10:47:30.977 URL p
E2012-03-27 10:47:30.977 URL ClientInfo 0 RemoteIP=fe80:0:0:0:0:0:0:1%1&Server=localhost&Referer=http://localhost:2281/cat/r/p&Agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.53.11 (KHTML, like Gecko) Version/5.1.3 Safari/534.53.10
E2012-03-27 10:47:30.977 URL Payload 0 HTTP/GET /cat/r/p
A2012-03-27 10:47:30.977 MVC InboundPhase 0 1ms
A2012-03-27 10:47:30.978 MVC TransitionPhase 0 0ms
t2012-03-27 10:47:30.978 MVC OutboundPhase
A2012-03-27 10:47:30.979 ModelService CompositeProblemService 0 0ms request=ModelRequest[domain=Cat, period=CURRENT, properties={thread=192.168.63.64, date=1332813600000, ip=192.168.63.64}]
T2012-03-27 10:47:30.989 MVC OutboundPhase 0 11ms
T2012-03-27 10:47:30.989 URL p 0 12ms module=r&in=p&out=p
PT1 Ca
\ No newline at end of file
cat-home/src/main/resources/META-INF/plexus/components.xml
浏览文件 @ 3487e703
......@@ -403,6 +403,11 @@
<role-hint>transaction-local</role-hint>
<field-name>m_transactionService</field-name>
</requirement>
<requirement>
<role>com.dianping.cat.report.page.model.spi.ModelService</role>
<role-hint>event-local</role-hint>
<field-name>m_eventService</field-name>
</requirement>
<requirement>
<role>com.dianping.cat.report.page.model.spi.ModelService</role>
<role-hint>problem-local</role-hint>
......@@ -433,6 +438,20 @@
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.model.event.LocalEventService</role>
<implementation>com.dianping.cat.report.page.model.event.LocalEventService</implementation>
<requirements>
<requirement>
<role>com.dianping.cat.message.spi.MessageConsumer</role>
<role-hint>realtime</role-hint>
<field-name>m_consumer</field-name>
</requirement>
<requirement>
<role>java.lang.String</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.report.page.model.problem.LocalProblemService</role>
<implementation>com.dianping.cat.report.page.model.problem.LocalProblemService</implementation>
......
cat-job/src/main/resources/META-INF/plexus/components.xml
浏览文件 @ 3487e703
......@@ -52,21 +52,7 @@
<implementation>com.dianping.cat.job.hdfs.DefaultOutputChannelManager</implementation>
<configuration>
<baseDir>dump</baseDir>
<serverUri>hdfs://192.168.7.43:9000/user/cat</serverUri>
</configuration>
<requirements>
<requirement>
<role>com.dianping.cat.message.spi.MessagePathBuilder</role>
</requirement>
</requirements>
</component>
<component>
<role>com.dianping.cat.job.hdfs.OutputChannelManager</role>
<role-hint>dump</role-hint>
<implementation>com.dianping.cat.job.hdfs.DefaultOutputChannelManager</implementation>
<configuration>
<baseDir>dump</baseDir>
<serverUri>hdfs://192.168.7.43:9000/user/cat</serverUri>
<serverUri></serverUri>
</configuration>
<requirements>
<requirement>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或