Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LFFZC
xxl-job
提交
7b3d53fa
X
xxl-job
项目概览
LFFZC
/
xxl-job
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
xxl-job
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7b3d53fa
编写于
5月 11, 2017
作者:
X
xueli.xue
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
底层优化
上级
47601872
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
116 addition
and
155 deletion
+116
-155
README.md
README.md
+1
-1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/LocalNomalJobBean.java
...ava/com/xxl/job/admin/core/jobbean/LocalNomalJobBean.java
+2
-2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java
...ava/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java
+2
-2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java
...m/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java
+3
-3
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
...a/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
+94
-94
xxl-job-core/src/main/java/com/xxl/job/core/glue/loader/GlueLoader.java
...rc/main/java/com/xxl/job/core/glue/loader/GlueLoader.java
+0
-16
xxl-job-core/src/main/java/com/xxl/job/core/glue/loader/impl/DbGlueLoader.java
.../java/com/xxl/job/core/glue/loader/impl/DbGlueLoader.java
+0
-30
xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobLogger.java
...core/src/main/java/com/xxl/job/core/log/XxlJobLogger.java
+6
-1
xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
...core/src/main/java/com/xxl/job/core/thread/JobThread.java
+8
-6
未找到文件。
README.md
浏览文件 @
7b3d53fa
...
...
@@ -857,6 +857,6 @@ XXL-JOB托管在Github上,如有问题可在 [ISSUES](https://github.com/xuxue
更多接入公司,欢迎在github
[
登记
](
https://github.com/xuxueli/xxl-job/issues/1
)
---
#### 支持的话可以扫一扫,支持 [XXL系列](https://github.com/xuxueli) 的建设
。
#### 支持的话可以扫一扫,支持 [XXL系列](https://github.com/xuxueli) 的建设
:)
![
输入图片说明
](
http://images2015.cnblogs.com/blog/554415/201605/554415-20160513183306234-1939652116.png
"在这里输入图片标题"
)
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/LocalNomalJobBean.java
浏览文件 @
7b3d53fa
...
...
@@ -20,7 +20,7 @@ package com.xxl.job.admin.core.jobbean;
//import com.xxl.job.client.util.JacksonUtil;
//import com.xxl.job.core.model.XxlJobInfo;
//import com.xxl.job.core.model.XxlJobLog;
//import com.xxl.job.core.thread.JobMonitorHelper;
//import com.xxl.job.core.thread.Job
Fail
MonitorHelper;
//import com.xxl.job.core.util.DynamicSchedulerUtil;
//
///**
...
...
@@ -84,7 +84,7 @@ package com.xxl.job.admin.core.jobbean;
// // update trigger info
// DynamicSchedulerUtil.xxlJobLogDao.updateTriggerInfo(jobLog);
// DynamicSchedulerUtil.xxlJobLogDao.updateHandleInfo(jobLog);
// JobMonitorHelper.monitor(jobLog.getId());
// Job
Fail
MonitorHelper.monitor(jobLog.getId());
// logger.info(">>>>>>>>>>> xxl-job trigger end, jobLog.id:{}, jobLog:{}", jobLog.getId(), jobLog);
//
// }
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java
浏览文件 @
7b3d53fa
...
...
@@ -6,7 +6,7 @@ import com.xxl.job.admin.core.model.XxlJobInfo;
import
com.xxl.job.admin.core.model.XxlJobLog
;
import
com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum
;
import
com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler
;
import
com.xxl.job.admin.core.thread.JobMonitorHelper
;
import
com.xxl.job.admin.core.thread.Job
Fail
MonitorHelper
;
import
com.xxl.job.admin.core.thread.JobRegistryMonitorHelper
;
import
com.xxl.job.core.biz.ExecutorBiz
;
import
com.xxl.job.core.biz.model.ReturnT
;
...
...
@@ -87,7 +87,7 @@ public class RemoteHttpJobBean extends QuartzJobBean {
XxlJobDynamicScheduler
.
xxlJobLogDao
.
updateTriggerInfo
(
jobLog
);
// monitor triger
JobMonitorHelper
.
monitor
(
jobLog
.
getId
());
Job
Fail
MonitorHelper
.
monitor
(
jobLog
.
getId
());
logger
.
debug
(
">>>>>>>>>>> xxl-job trigger end, jobId:{}"
,
jobLog
.
getId
());
}
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java
浏览文件 @
7b3d53fa
...
...
@@ -2,7 +2,7 @@ package com.xxl.job.admin.core.schedule;
import
com.xxl.job.admin.core.jobbean.RemoteHttpJobBean
;
import
com.xxl.job.admin.core.model.XxlJobInfo
;
import
com.xxl.job.admin.core.thread.JobMonitorHelper
;
import
com.xxl.job.admin.core.thread.Job
Fail
MonitorHelper
;
import
com.xxl.job.admin.core.thread.JobRegistryMonitorHelper
;
import
com.xxl.job.admin.dao.IXxlJobGroupDao
;
import
com.xxl.job.admin.dao.IXxlJobInfoDao
;
...
...
@@ -43,7 +43,7 @@ public final class XxlJobDynamicScheduler implements ApplicationContextAware, In
JobRegistryMonitorHelper
.
getInstance
().
start
();
// admin monitor run
JobMonitorHelper
.
getInstance
().
start
();
Job
Fail
MonitorHelper
.
getInstance
().
start
();
}
// destroy
...
...
@@ -52,7 +52,7 @@ public final class XxlJobDynamicScheduler implements ApplicationContextAware, In
JobRegistryMonitorHelper
.
getInstance
().
toStop
();
// admin monitor stop
JobMonitorHelper
.
getInstance
().
toStop
();
Job
Fail
MonitorHelper
.
getInstance
().
toStop
();
serverFactory
.
destroy
();
}
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java
→
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/Job
Fail
MonitorHelper.java
浏览文件 @
7b3d53fa
package
com.xxl.job.admin.core.thread
;
import
com.xxl.job.admin.core.model.XxlJobGroup
;
import
com.xxl.job.admin.core.model.XxlJobInfo
;
import
com.xxl.job.admin.core.model.XxlJobLog
;
import
com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler
;
import
com.xxl.job.admin.core.util.MailUtil
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
java.text.MessageFormat
;
import
java.util.Arrays
;
import
java.util.HashSet
;
import
java.util.Set
;
import
java.util.concurrent.*
;
/**
* job monitor instance
* @author xuxueli 2015-9-1 18:05:56
*/
public
class
Job
MonitorHelper
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
Job
MonitorHelper
.
class
);
private
static
Job
MonitorHelper
instance
=
new
JobMonitorHelper
();
public
static
Job
MonitorHelper
getInstance
(){
return
instance
;
}
private
LinkedBlockingQueue
<
Integer
>
queue
=
new
LinkedBlockingQueue
<
Integer
>(
0xfff8
);
private
Thread
monitorThread
;
private
boolean
toStop
=
false
;
public
void
start
(){
monitorThread
=
new
Thread
(
new
Runnable
()
{
@Override
public
void
run
()
{
while
(!
toStop
)
{
try
{
logger
.
debug
(
">>>>>>>>>>> job monitor beat ... "
);
Integer
jobLogId
=
Job
MonitorHelper
.
instance
.
queue
.
take
();
if
(
jobLogId
!=
null
&&
jobLogId
>
0
)
{
logger
.
debug
(
">>>>>>>>>>> job monitor heat success, JobLogId:{}"
,
jobLogId
);
XxlJobLog
log
=
XxlJobDynamicScheduler
.
xxlJobLogDao
.
load
(
jobLogId
);
if
(
log
!=
null
)
{
if
(
ReturnT
.
SUCCESS_CODE
==
log
.
getTriggerCode
()
&&
log
.
getHandleCode
()==
0
)
{
// running
try
{
TimeUnit
.
SECONDS
.
sleep
(
10
);
}
catch
(
InterruptedException
e
)
{
e
.
printStackTrace
();
}
Job
MonitorHelper
.
monitor
(
jobLogId
);
}
if
(
ReturnT
.
SUCCESS_CODE
==
log
.
getTriggerCode
()
&&
ReturnT
.
SUCCESS_CODE
==
log
.
getHandleCode
())
{
// pass
}
if
(
ReturnT
.
FAIL_CODE
==
log
.
getTriggerCode
()||
ReturnT
.
FAIL_CODE
==
log
.
getHandleCode
())
{
XxlJobInfo
info
=
XxlJobDynamicScheduler
.
xxlJobInfoDao
.
loadById
(
log
.
getJobId
());
if
(
info
!=
null
&&
info
.
getAlarmEmail
()!=
null
&&
info
.
getAlarmEmail
().
trim
().
length
()>
0
)
{
Set
<
String
>
emailSet
=
new
HashSet
<
String
>(
Arrays
.
asList
(
info
.
getAlarmEmail
().
split
(
","
)));
for
(
String
email:
emailSet
)
{
String
title
=
"《调度监控报警》(任务调度中心XXL-JOB)"
;
XxlJobGroup
group
=
XxlJobDynamicScheduler
.
xxlJobGroupDao
.
load
(
Integer
.
valueOf
(
info
.
getJobGroup
()));
String
content
=
MessageFormat
.
format
(
"任务调度失败, 执行器名称:{0}, 任务描述:{1}."
,
group
!=
null
?
group
.
getTitle
():
"null"
,
info
.
getJobDesc
());
MailUtil
.
sendMail
(
email
,
title
,
content
,
false
,
null
);
}
}
}
}
}
}
catch
(
Exception
e
)
{
logger
.
error
(
"job monitor error:{}"
,
e
);
}
}
}
});
monitorThread
.
setDaemon
(
true
);
monitorThread
.
start
();
}
public
void
toStop
(){
toStop
=
true
;
//monitorThread.interrupt();
}
// producer
public
static
void
monitor
(
int
jobLogId
){
getInstance
().
queue
.
offer
(
jobLogId
);
}
}
package
com.xxl.job.admin.core.thread
;
import
com.xxl.job.admin.core.model.XxlJobGroup
;
import
com.xxl.job.admin.core.model.XxlJobInfo
;
import
com.xxl.job.admin.core.model.XxlJobLog
;
import
com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler
;
import
com.xxl.job.admin.core.util.MailUtil
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
java.text.MessageFormat
;
import
java.util.Arrays
;
import
java.util.HashSet
;
import
java.util.Set
;
import
java.util.concurrent.*
;
/**
* job monitor instance
* @author xuxueli 2015-9-1 18:05:56
*/
public
class
Job
FailMonitorHelper
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
Job
FailMonitorHelper
.
class
);
private
static
Job
FailMonitorHelper
instance
=
new
JobFailMonitorHelper
();
public
static
Job
FailMonitorHelper
getInstance
(){
return
instance
;
}
private
LinkedBlockingQueue
<
Integer
>
queue
=
new
LinkedBlockingQueue
<
Integer
>(
0xfff8
);
private
Thread
monitorThread
;
private
boolean
toStop
=
false
;
public
void
start
(){
monitorThread
=
new
Thread
(
new
Runnable
()
{
@Override
public
void
run
()
{
while
(!
toStop
)
{
try
{
logger
.
debug
(
">>>>>>>>>>> job monitor beat ... "
);
Integer
jobLogId
=
Job
FailMonitorHelper
.
instance
.
queue
.
take
();
if
(
jobLogId
!=
null
&&
jobLogId
>
0
)
{
logger
.
debug
(
">>>>>>>>>>> job monitor heat success, JobLogId:{}"
,
jobLogId
);
XxlJobLog
log
=
XxlJobDynamicScheduler
.
xxlJobLogDao
.
load
(
jobLogId
);
if
(
log
!=
null
)
{
if
(
ReturnT
.
SUCCESS_CODE
==
log
.
getTriggerCode
()
&&
log
.
getHandleCode
()==
0
)
{
// running
try
{
TimeUnit
.
SECONDS
.
sleep
(
10
);
}
catch
(
InterruptedException
e
)
{
e
.
printStackTrace
();
}
Job
FailMonitorHelper
.
monitor
(
jobLogId
);
}
if
(
ReturnT
.
SUCCESS_CODE
==
log
.
getTriggerCode
()
&&
ReturnT
.
SUCCESS_CODE
==
log
.
getHandleCode
())
{
// pass
}
if
(
ReturnT
.
FAIL_CODE
==
log
.
getTriggerCode
()||
ReturnT
.
FAIL_CODE
==
log
.
getHandleCode
())
{
XxlJobInfo
info
=
XxlJobDynamicScheduler
.
xxlJobInfoDao
.
loadById
(
log
.
getJobId
());
if
(
info
!=
null
&&
info
.
getAlarmEmail
()!=
null
&&
info
.
getAlarmEmail
().
trim
().
length
()>
0
)
{
Set
<
String
>
emailSet
=
new
HashSet
<
String
>(
Arrays
.
asList
(
info
.
getAlarmEmail
().
split
(
","
)));
for
(
String
email:
emailSet
)
{
String
title
=
"《调度监控报警》(任务调度中心XXL-JOB)"
;
XxlJobGroup
group
=
XxlJobDynamicScheduler
.
xxlJobGroupDao
.
load
(
Integer
.
valueOf
(
info
.
getJobGroup
()));
String
content
=
MessageFormat
.
format
(
"任务调度失败, 执行器名称:{0}, 任务描述:{1}."
,
group
!=
null
?
group
.
getTitle
():
"null"
,
info
.
getJobDesc
());
MailUtil
.
sendMail
(
email
,
title
,
content
,
false
,
null
);
}
}
}
}
}
}
catch
(
Exception
e
)
{
logger
.
error
(
"job monitor error:{}"
,
e
);
}
}
}
});
monitorThread
.
setDaemon
(
true
);
monitorThread
.
start
();
}
public
void
toStop
(){
toStop
=
true
;
//monitorThread.interrupt();
}
// producer
public
static
void
monitor
(
int
jobLogId
){
getInstance
().
queue
.
offer
(
jobLogId
);
}
}
xxl-job-core/src/main/java/com/xxl/job/core/glue/loader/GlueLoader.java
已删除
100644 → 0
浏览文件 @
47601872
//package com.xxl.job.core.glue.loader;
//
///**
// * code source loader
// * @author xuxueli 2016-1-2 20:01:39
// */
//public interface GlueLoader {
//
// /**
// * load code source by name, ensure every load is the latest.
// * @param jobId
// * @return code source
// */
// public String load(int jobId);
//
//}
xxl-job-core/src/main/java/com/xxl/job/core/glue/loader/impl/DbGlueLoader.java
已删除
100644 → 0
浏览文件 @
47601872
//package com.xxl.job.core.glue.loader.impl;
//
//import com.xxl.job.core.glue.loader.GlueLoader;
//import com.xxl.job.core.util.DBUtil;
//
//import javax.sql.DataSource;
//import java.util.List;
//import java.util.Map;
//
///**
// * Created by xuxueli on 16/9/30.
// */
//public class DbGlueLoader implements GlueLoader {
//
// private DataSource dataSource;
// public void setDataSource(DataSource dataSource) {
// this.dataSource = dataSource;
// }
//
// @Override
// public String load(int jobId) {
// String sql = "SELECT glue_source FROM XXL_JOB_QRTZ_TRIGGER_INFO WHERE id = ?";
// List<Map<String, Object>> result = DBUtil.query(dataSource, sql, new Object[]{jobId});
// if (result!=null && result.size()==1 && result.get(0)!=null && result.get(0).get("glue_source")!=null ) {
// return (String) result.get(0).get("glue_source");
// }
// return null;
// }
//
//}
xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobLogger.java
浏览文件 @
7b3d53fa
...
...
@@ -20,6 +20,12 @@ public class XxlJobLogger {
*/
public
static
void
log
(
String
appendLog
)
{
// logFileName
String
logFileName
=
XxlJobFileAppender
.
contextHolder
.
get
();
if
(
logFileName
==
null
||
logFileName
.
trim
().
length
()==
0
)
{
return
;
}
// "yyyy-MM-dd HH:mm:ss [ClassName]-[MethodName]-[LineNumber]-[ThreadName] log";
StackTraceElement
[]
stackTraceElements
=
new
Throwable
().
getStackTrace
();
StackTraceElement
callInfo
=
stackTraceElements
[
1
];
...
...
@@ -34,7 +40,6 @@ public class XxlJobLogger {
String
formatAppendLog
=
stringBuffer
.
toString
();
// appendlog
String
logFileName
=
XxlJobFileAppender
.
contextHolder
.
get
();
XxlJobFileAppender
.
appendLog
(
logFileName
,
formatAppendLog
);
logger
.
warn
(
"[{}]: {}"
,
logFileName
,
formatAppendLog
);
...
...
xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
浏览文件 @
7b3d53fa
...
...
@@ -106,27 +106,29 @@ public class JobThread extends Thread{
String
logFileName
=
XxlJobFileAppender
.
makeLogFileName
(
new
Date
(
triggerParam
.
getLogDateTim
()),
triggerParam
.
getLogId
());
XxlJobFileAppender
.
contextHolder
.
set
(
logFileName
);
XxlJobLogger
.
log
(
"
----------- xxl-job job execute start -----------"
);
XxlJobLogger
.
log
(
"
<br>----------- xxl-job job execute start -----------<br>----------- Params:"
+
handlerParams
);
executeResult
=
handler
.
execute
(
handlerParams
);
if
(
executeResult
==
null
)
{
executeResult
=
ReturnT
.
FAIL
;
}
XxlJobLogger
.
log
(
"<br>----------- xxl-job job execute end(finish) -----------<br>----------- ReturnT:"
+
executeResult
);
}
catch
(
Exception
e
)
{
if
(
toStop
)
{
XxlJobLogger
.
log
(
"<br>-----------
xxl-job
toStop, stopReason:"
+
stopReason
);
XxlJobLogger
.
log
(
"<br>-----------
JobThread
toStop, stopReason:"
+
stopReason
);
}
StringWriter
stringWriter
=
new
StringWriter
();
e
.
printStackTrace
(
new
PrintWriter
(
stringWriter
));
String
errorMsg
=
stringWriter
.
toString
();
XxlJobLogger
.
log
(
"JobThread Exception:"
+
errorMsg
);
executeResult
=
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
errorMsg
);
executeResult
=
new
ReturnT
<
String
>(
ReturnT
.
FAIL_CODE
,
stringWriter
.
toString
()
);
XxlJobLogger
.
log
(
"<br>----------- JobThread Exception:"
+
errorMsg
+
"<br>----------- xxl-job job execute end(error) -----------"
);
}
XxlJobLogger
.
log
(
"----------- xxl-job job execute end ----------- <br> "
+
"Look : ExecutorParams:"
+
handlerParams
+
", Code:"
+
executeResult
.
getCode
()
+
", Msg:"
+
executeResult
.
getMsg
());
// callback handler info
if
(!
toStop
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录