Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
7094e5e1
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,发现更多精彩内容 >>
提交
7094e5e1
编写于
3月 18, 2014
作者:
Y
youyong205
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify the send email
上级
458a897d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
12 deletion
+5
-12
cat-home/src/main/java/com/dianping/cat/report/task/metric/AlertConfig.java
...java/com/dianping/cat/report/task/metric/AlertConfig.java
+1
-7
cat-home/src/main/java/com/dianping/cat/report/task/metric/MetricAlert.java
...java/com/dianping/cat/report/task/metric/MetricAlert.java
+1
-4
cat-home/src/test/java/com/dianping/cat/system/tool/DefaultGmailTest.java
...t/java/com/dianping/cat/system/tool/DefaultGmailTest.java
+3
-1
未找到文件。
cat-home/src/main/java/com/dianping/cat/report/task/metric/AlertConfig.java
浏览文件 @
7094e5e1
...
...
@@ -21,13 +21,7 @@ public class AlertConfig {
}
public
String
buildMailTitle
(
ProductLine
productLine
,
MetricItemConfig
config
)
{
String
title
=
"业务告警, 产品线["
+
productLine
.
getTitle
()
+
"], 业务指标["
+
config
.
getTitle
()
+
"]"
;
return
title
;
}
public
String
buildMailContent
(
ProductLine
productLine
,
MetricItemConfig
config
)
{
String
title
=
"业务告警, 产品线["
+
productLine
.
getTitle
()
+
"], 业务指标["
+
config
.
getTitle
()
+
"]"
;
String
title
=
"[业务告警] 产品线["
+
productLine
.
getTitle
()
+
"] 业务指标["
+
config
.
getTitle
()
+
"]"
;
return
title
;
}
...
...
cat-home/src/main/java/com/dianping/cat/report/task/metric/MetricAlert.java
浏览文件 @
7094e5e1
...
...
@@ -180,7 +180,7 @@ public class MetricAlert implements Task, LogEnabled {
}
if
(
alert
!=
null
&&
alert
.
getKey
())
{
String
content
=
"[ "
+
alert
.
getValue
()
+
" ][ minute:"
+
(
minute
+
60
)
%
60
+
" ][ time:"
+
m_sdf
.
format
(
new
Date
())
+
"]
"
;
+
m_sdf
.
format
(
new
Date
())
+
"]
[ time:"
+
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:sss"
).
format
(
new
Date
())+
" ]"
;
sendAlertInfo
(
productLine
,
config
,
content
);
...
...
@@ -194,10 +194,7 @@ public class MetricAlert implements Task, LogEnabled {
int
length
=
end
-
start
+
1
;
double
[]
result
=
new
double
[
length
];
System
.
arraycopy
(
baseline
,
start
,
result
,
0
,
length
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
System
.
out
.
println
(
sdf
.
format
(
date
)
+
" "
+
start
+
" "
+
end
);
return
result
;
}
...
...
cat-home/src/test/java/com/dianping/cat/system/tool/DefaultGmailTest.java
浏览文件 @
7094e5e1
...
...
@@ -19,7 +19,9 @@ public class DefaultGmailTest extends ComponentTestCase {
emails
.
add
(
"yong.you@dianping.com"
);
String
content
=
Files
.
forIO
().
readFrom
(
new
File
(
"/data/applogs/cat/cat_20140313.log"
),
"utf-8"
);
boolean
result
=
mailsms
.
sendEmail
(
"title"
,
content
,
emails
);
String
title
=
"业务告警, 产品线[支付], 业务指标[创建订单]"
;
content
=
content
+
content
;
boolean
result
=
mailsms
.
sendEmail
(
title
,
content
,
emails
);
Assert
.
assertEquals
(
true
,
result
);
Thread
.
sleep
(
1000
*
5
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录