Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
熊鹏飞
/
xxljob220
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7127c040
authored
Jan 19, 2020
by
xuxueli
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
任务告警模块化,代码重构优化。
parent
882a439e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
23 deletions
doc/XXL-JOB官方文档.md
xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
doc/XXL-JOB官方文档.md
View file @
7127c040
## 《分
布式任务调度平台XXL-JOB》
## 《分
布式任务调度平台XXL-JOB》
...
@@ -1245,8 +1245,7 @@ API服务请求参考代码:com.xxl.job.executor.ExecutorBizTest
...
@@ -1245,8 +1245,7 @@ API服务请求参考代码:com.xxl.job.executor.ExecutorBizTest
-
2、提供基于HTTP的任务Handler(Bean任务,JobHandler="HttpJobHandler");业务方只需要提供HTTP链接即可,不限制语言、平台;
-
2、提供基于HTTP的任务Handler(Bean任务,JobHandler="HttpJobHandler");业务方只需要提供HTTP链接即可,不限制语言、平台;
### 5.18 任务失败告警
### 5.18 任务失败告警
默认提供邮件失败告警,可扩展短信、钉钉等方式,扩展代码位置为 "com.xxl.job.admin.core.alarm.JobAlarmer"。
默认提供邮件失败告警,可扩展短信、钉钉等方式。如果需要新增一种告警方式,只需要新增一个实现 "com.xxl.job.admin.core.alarm.JobAlarm" 接口的告警实现即可。可以参考默认提供邮箱告警实现 "EmailJobAlarm"。
如果需要新增一种告警方式,只需要新增一个实现 "com.xxl.job.admin.core.alarm.JobAlarm" 接口的告警实现即可
### 5.19 调度中心Docker镜像构建
### 5.19 调度中心Docker镜像构建
可以通过以下命令快速构建调度中心,并启动运行;
可以通过以下命令快速构建调度中心,并启动运行;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java
View file @
7127c040
package
com
.
xxl
.
job
.
admin
.
core
.
alarm
;
package
com
.
xxl
.
job
.
admin
.
core
.
alarm
;
import
com.xxl.job.admin.core.alarm.impl.EmailJobAlarm
;
import
com.xxl.job.admin.core.model.XxlJobInfo
;
import
com.xxl.job.admin.core.model.XxlJobInfo
;
import
com.xxl.job.admin.core.model.XxlJobLog
;
import
com.xxl.job.admin.core.model.XxlJobLog
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.BeansException
;
import
org.springframework.beans.factory.InitializingBean
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.ApplicationContextAware
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
javax.annotation.Resource
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
@Component
@Component
public
class
JobAlarmer
{
public
class
JobAlarmer
implements
ApplicationContextAware
,
InitializingBean
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
JobAlarmer
.
class
);
@Resource
private
ApplicationContext
applicationContext
;
private
EmailJobAlarm
emailJobAlarm
;
private
List
<
JobAlarm
>
jobAlarmList
;
@Override
public
void
setApplicationContext
(
ApplicationContext
applicationContext
)
throws
BeansException
{
this
.
applicationContext
=
applicationContext
;
}
@Override
public
void
afterPropertiesSet
()
throws
Exception
{
Map
<
String
,
JobAlarm
>
serviceBeanMap
=
applicationContext
.
getBeansOfType
(
JobAlarm
.
class
);
if
(
serviceBeanMap
!=
null
&&
serviceBeanMap
.
size
()
>
0
)
{
jobAlarmList
=
new
ArrayList
<
JobAlarm
>(
serviceBeanMap
.
values
());
}
}
/**
/**
* job alarm
* job alarm
...
@@ -22,15 +43,23 @@ public class JobAlarmer {
...
@@ -22,15 +43,23 @@ public class JobAlarmer {
*/
*/
public
boolean
alarm
(
XxlJobInfo
info
,
XxlJobLog
jobLog
)
{
public
boolean
alarm
(
XxlJobInfo
info
,
XxlJobLog
jobLog
)
{
// alarm by email
boolean
result
=
false
;
boolean
emailResult
=
emailJobAlarm
.
doAlarm
(
info
,
jobLog
);
if
(
jobAlarmList
!=
null
&&
jobAlarmList
.
size
()>
0
)
{
result
=
true
;
// success means all-success
for
(
JobAlarm
alarm:
jobAlarmList
)
{
boolean
resultItem
=
false
;
try
{
resultItem
=
alarm
.
doAlarm
(
info
,
jobLog
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
if
(!
resultItem
)
{
result
=
false
;
}
}
}
// do something, custom alarm strategy, such as sms
return
result
;
// ...
return
emailResult
;
}
}
}
}
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
View file @
7127c040
...
@@ -61,13 +61,7 @@ public class JobFailMonitorHelper {
...
@@ -61,13 +61,7 @@ public class JobFailMonitorHelper {
// 2、fail alarm monitor
// 2、fail alarm monitor
int
newAlarmStatus
=
0
;
// 告警状态:0-默认、-1=锁定状态、1-无需告警、2-告警成功、3-告警失败
int
newAlarmStatus
=
0
;
// 告警状态:0-默认、-1=锁定状态、1-无需告警、2-告警成功、3-告警失败
if
(
info
!=
null
&&
info
.
getAlarmEmail
()!=
null
&&
info
.
getAlarmEmail
().
trim
().
length
()>
0
)
{
if
(
info
!=
null
&&
info
.
getAlarmEmail
()!=
null
&&
info
.
getAlarmEmail
().
trim
().
length
()>
0
)
{
boolean
alarmResult
=
true
;
boolean
alarmResult
=
XxlJobAdminConfig
.
getAdminConfig
().
getJobAlarmer
().
alarm
(
info
,
log
);
try
{
alarmResult
=
XxlJobAdminConfig
.
getAdminConfig
().
getJobAlarmer
().
alarm
(
info
,
log
);
}
catch
(
Exception
e
)
{
alarmResult
=
false
;
logger
.
error
(
e
.
getMessage
(),
e
);
}
newAlarmStatus
=
alarmResult
?
2
:
3
;
newAlarmStatus
=
alarmResult
?
2
:
3
;
}
else
{
}
else
{
newAlarmStatus
=
1
;
newAlarmStatus
=
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment