Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
40adffaa
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,发现更多精彩内容 >>
提交
40adffaa
编写于
7月 22, 2014
作者:
Y
youyong205
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug
上级
dc93bfa8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
12 deletion
+21
-12
cat-broker/src/main/java/com/dianping/cat/broker/api/app/AppDataConsumer.java
...java/com/dianping/cat/broker/api/app/AppDataConsumer.java
+13
-3
cat-broker/src/main/java/com/dianping/cat/broker/api/app/BucketHandler.java
...n/java/com/dianping/cat/broker/api/app/BucketHandler.java
+8
-8
cat-broker/src/main/java/com/dianping/cat/broker/api/page/MonitorManager.java
...java/com/dianping/cat/broker/api/page/MonitorManager.java
+0
-1
未找到文件。
cat-broker/src/main/java/com/dianping/cat/broker/api/app/AppDataConsumer.java
浏览文件 @
40adffaa
package
com.dianping.cat.broker.api.app
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.concurrent.ConcurrentHashMap
;
import
org.codehaus.plexus.logging.LogEnabled
;
...
...
@@ -16,7 +18,7 @@ import com.dianping.cat.config.app.AppDataService;
public
class
AppDataConsumer
implements
Initializable
,
LogEnabled
{
public
static
final
long
DURATION
=
5
*
60
*
1000L
;
@Inject
private
AppDataService
m_appDataService
;
...
...
@@ -99,12 +101,15 @@ public class AppDataConsumer implements Initializable, LogEnabled {
private
class
BucketThreadController
implements
Task
{
private
SimpleDateFormat
m_sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm"
);
private
void
closeLastTask
(
long
currentDuration
)
{
Long
last
=
new
Long
(
currentDuration
-
DURATION
);
BucketHandler
lastBucketHandler
=
m_tasks
.
get
(
last
);
if
(
lastBucketHandler
!=
null
)
{
lastBucketHandler
.
shutdown
();
m_logger
.
info
(
"closed bucket handler ,time "
+
m_sdf
.
format
(
new
Date
(
currentDuration
)));
}
}
...
...
@@ -126,7 +131,7 @@ public class AppDataConsumer implements Initializable, LogEnabled {
try
{
long
currentDuration
=
curTime
-
curTime
%
DURATION
;
removeLastLastTask
(
currentDuration
);
closeLastTask
(
currentDuration
);
startCurrentTask
(
currentDuration
);
...
...
@@ -151,21 +156,26 @@ public class AppDataConsumer implements Initializable, LogEnabled {
Long
cur
=
new
Long
(
currentDuration
);
if
(
m_tasks
.
get
(
cur
)
==
null
)
{
BucketHandler
curBucketHandler
=
new
BucketHandler
(
cur
,
m_appDataService
);
m_logger
.
info
(
"starting bucket handler ,time "
+
m_sdf
.
format
(
new
Date
(
currentDuration
)));
Threads
.
forGroup
(
"Cat"
).
start
(
curBucketHandler
);
m_tasks
.
put
(
cur
,
curBucketHandler
);
m_logger
.
info
(
"started bucket handler ,time "
+
m_sdf
.
format
(
new
Date
(
currentDuration
)));
}
}
private
void
startNextTask
(
long
currentDuration
)
{
Long
next
=
new
Long
(
currentDuration
+
DURATION
);
if
(
m_tasks
.
get
(
next
)
==
null
)
{
BucketHandler
nextBucketHandler
=
new
BucketHandler
(
next
,
m_appDataService
);
m_logger
.
info
(
"starting bucket handler ,time "
+
m_sdf
.
format
(
new
Date
(
next
)));
Threads
.
forGroup
(
"Cat"
).
start
(
nextBucketHandler
);
m_tasks
.
put
(
next
,
nextBucketHandler
);
m_logger
.
info
(
"started bucket handler ,time "
+
m_sdf
.
format
(
new
Date
(
next
)));
}
}
}
}
cat-broker/src/main/java/com/dianping/cat/broker/api/app/BucketHandler.java
浏览文件 @
40adffaa
...
...
@@ -94,13 +94,11 @@ public class BucketHandler implements Task {
@Override
public
String
getName
()
{
return
"BucketHandler
"
;
return
"BucketHandler
-"
+
m_startTime
;
}
public
boolean
isActive
()
{
synchronized
(
this
)
{
return
m_isActive
;
}
return
m_isActive
;
}
private
void
processEntity
(
AppData
appData
)
{
...
...
@@ -144,7 +142,11 @@ public class BucketHandler implements Task {
AppData
appData
=
m_appDataQueue
.
poll
();
if
(
appData
!=
null
)
{
processEntity
(
appData
);
try
{
processEntity
(
appData
);
}
catch
(
Exception
e
)
{
Cat
.
logError
(
e
);
}
}
}
...
...
@@ -163,9 +165,7 @@ public class BucketHandler implements Task {
@Override
public
void
shutdown
()
{
synchronized
(
this
)
{
m_isActive
=
false
;
}
m_isActive
=
false
;
}
}
cat-broker/src/main/java/com/dianping/cat/broker/api/page/MonitorManager.java
浏览文件 @
40adffaa
...
...
@@ -156,7 +156,6 @@ public class MonitorManager implements Initializable, LogEnabled {
buildMessage
(
entity
,
url
,
ipInfo
);
}
else
{
Cat
.
logEvent
(
"ip"
,
"notFound"
,
Event
.
SUCCESS
,
ip
);
m_logger
.
error
(
String
.
format
(
"can't find ip for %s"
,
ip
));
}
t
.
setStatus
(
Transaction
.
SUCCESS
);
}
catch
(
Exception
e
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录