Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
2d153e56
提交
2d153e56
authored
6月 12, 2020
作者:
xuxueli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
日志组件逻辑调整:日志组件改为通过 XxlJobContent 获取任务上下文并匹配写入对应日志文件;
上级
e1779788
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
13 行增加
和
12 行删除
+13
-12
XXL-JOB官方文档.md
doc/XXL-JOB官方文档.md
+2
-1
XxlJobContext.java
...src/main/java/com/xxl/job/core/context/XxlJobContext.java
+1
-1
ScriptJobHandler.java
.../java/com/xxl/job/core/handler/impl/ScriptJobHandler.java
+1
-1
XxlJobFileAppender.java
...rc/main/java/com/xxl/job/core/log/XxlJobFileAppender.java
+0
-5
XxlJobLogger.java
...core/src/main/java/com/xxl/job/core/log/XxlJobLogger.java
+3
-1
JobThread.java
...core/src/main/java/com/xxl/job/core/thread/JobThread.java
+0
-2
TriggerCallbackThread.java
...n/java/com/xxl/job/core/thread/TriggerCallbackThread.java
+6
-1
没有找到文件。
doc/XXL-JOB官方文档.md
浏览文件 @
2d153e56
...
@@ -1992,7 +1992,8 @@ data: post-data
...
@@ -1992,7 +1992,8 @@ data: post-data
-
4、多个项目依赖升级至较新稳定版本,如netty、spring、springboot等;
-
4、多个项目依赖升级至较新稳定版本,如netty、spring、springboot等;
-
5、通用HTTP任务Handler(httpJobHandler)优化:修复 "setDoOutput(true)" 导致任务请求GetMethod失效问题;
-
5、通用HTTP任务Handler(httpJobHandler)优化:修复 "setDoOutput(true)" 导致任务请求GetMethod失效问题;
-
6、新增任务属性 "XxlJobContent" ,统一维护任务上下文信息,包括任务ID、分片参数等,方便运行时存取任务相关信息;
-
6、新增任务属性 "XxlJobContent" ,统一维护任务上下文信息,包括任务ID、分片参数等,方便运行时存取任务相关信息;
-
废弃 "ShardingUtil" 组件:改用 "XxlJobContext.getXxlJobContext().getShardIndex()/getShardTotal();" 获取分片参数;
-
6.1、废弃 "ShardingUtil" 组件:改用 "XxlJobContext.getXxlJobContext().getShardIndex()/getShardTotal();" 获取分片参数;
-
6.2、日志组件逻辑调整:日志组件改为通过 XxlJobContent 获取任务上下文并匹配写入对应日志文件;
-
7、
[
规划中
]
任务触发参数优化:支持选择 "Cron触发"、"固定间隔时间触发"、"指定时间点触发"、"不选择" 等;
-
7、
[
规划中
]
任务触发参数优化:支持选择 "Cron触发"、"固定间隔时间触发"、"指定时间点触发"、"不选择" 等;
### 7.32 版本 v2.3.0 Release Notes[规划中]
### 7.32 版本 v2.3.0 Release Notes[规划中]
...
...
xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java
浏览文件 @
2d153e56
...
@@ -55,7 +55,7 @@ public class XxlJobContext {
...
@@ -55,7 +55,7 @@ public class XxlJobContext {
// ---------------------- tool ----------------------
// ---------------------- tool ----------------------
private
static
InheritableThreadLocal
<
XxlJobContext
>
contextHolder
=
new
InheritableThreadLocal
<
XxlJobContext
>();
private
static
InheritableThreadLocal
<
XxlJobContext
>
contextHolder
=
new
InheritableThreadLocal
<
XxlJobContext
>();
// support for child thread of job handler)
public
static
void
setXxlJobContext
(
XxlJobContext
xxlJobContext
){
public
static
void
setXxlJobContext
(
XxlJobContext
xxlJobContext
){
contextHolder
.
set
(
xxlJobContext
);
contextHolder
.
set
(
xxlJobContext
);
...
...
xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java
浏览文件 @
2d153e56
...
@@ -68,7 +68,7 @@ public class ScriptJobHandler extends IJobHandler {
...
@@ -68,7 +68,7 @@ public class ScriptJobHandler extends IJobHandler {
}
}
// log file
// log file
String
logFileName
=
XxlJob
FileAppender
.
contextHolder
.
get
();
String
logFileName
=
XxlJob
Context
.
getXxlJobContext
().
getJobLogFileName
();
// script params:0=param、1=分片序号、2=分片总数
// script params:0=param、1=分片序号、2=分片总数
String
[]
scriptParams
=
new
String
[
3
];
String
[]
scriptParams
=
new
String
[
3
];
...
...
xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java
浏览文件 @
2d153e56
...
@@ -14,11 +14,6 @@ import java.util.Date;
...
@@ -14,11 +14,6 @@ import java.util.Date;
*/
*/
public
class
XxlJobFileAppender
{
public
class
XxlJobFileAppender
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
XxlJobFileAppender
.
class
);
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
XxlJobFileAppender
.
class
);
// for JobThread (support log for child thread of job handler)
//public static ThreadLocal<String> contextHolder = new ThreadLocal<String>();
public
static
final
InheritableThreadLocal
<
String
>
contextHolder
=
new
InheritableThreadLocal
<
String
>();
/**
/**
* log base path
* log base path
...
...
xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobLogger.java
浏览文件 @
2d153e56
package
com
.
xxl
.
job
.
core
.
log
;
package
com
.
xxl
.
job
.
core
.
log
;
import
com.xxl.job.core.context.XxlJobContext
;
import
com.xxl.job.core.util.DateUtil
;
import
com.xxl.job.core.util.DateUtil
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -38,7 +39,8 @@ public class XxlJobLogger {
...
@@ -38,7 +39,8 @@ public class XxlJobLogger {
String
formatAppendLog
=
stringBuffer
.
toString
();
String
formatAppendLog
=
stringBuffer
.
toString
();
// appendlog
// appendlog
String
logFileName
=
XxlJobFileAppender
.
contextHolder
.
get
();
String
logFileName
=
XxlJobContext
.
getXxlJobContext
().
getJobLogFileName
();
if
(
logFileName
!=
null
&&
logFileName
.
trim
().
length
()>
0
)
{
if
(
logFileName
!=
null
&&
logFileName
.
trim
().
length
()>
0
)
{
XxlJobFileAppender
.
appendLog
(
logFileName
,
formatAppendLog
);
XxlJobFileAppender
.
appendLog
(
logFileName
,
formatAppendLog
);
}
else
{
}
else
{
...
...
xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
浏览文件 @
2d153e56
...
@@ -123,8 +123,6 @@ public class JobThread extends Thread{
...
@@ -123,8 +123,6 @@ public class JobThread extends Thread{
triggerParam
.
getBroadcastIndex
(),
triggerParam
.
getBroadcastIndex
(),
triggerParam
.
getBroadcastTotal
()));
triggerParam
.
getBroadcastTotal
()));
XxlJobFileAppender
.
contextHolder
.
set
(
logFileName
);
// execute
// execute
XxlJobLogger
.
log
(
"<br>----------- xxl-job job execute start -----------<br>----------- Param:"
+
triggerParam
.
getExecutorParams
());
XxlJobLogger
.
log
(
"<br>----------- xxl-job job execute start -----------<br>----------- Param:"
+
triggerParam
.
getExecutorParams
());
...
...
xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
浏览文件 @
2d153e56
...
@@ -3,6 +3,7 @@ package com.xxl.job.core.thread;
...
@@ -3,6 +3,7 @@ package com.xxl.job.core.thread;
import
com.xxl.job.core.biz.AdminBiz
;
import
com.xxl.job.core.biz.AdminBiz
;
import
com.xxl.job.core.biz.model.HandleCallbackParam
;
import
com.xxl.job.core.biz.model.HandleCallbackParam
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.biz.model.ReturnT
;
import
com.xxl.job.core.context.XxlJobContext
;
import
com.xxl.job.core.enums.RegistryConfig
;
import
com.xxl.job.core.enums.RegistryConfig
;
import
com.xxl.job.core.executor.XxlJobExecutor
;
import
com.xxl.job.core.executor.XxlJobExecutor
;
import
com.xxl.job.core.log.XxlJobFileAppender
;
import
com.xxl.job.core.log.XxlJobFileAppender
;
...
@@ -187,7 +188,11 @@ public class TriggerCallbackThread {
...
@@ -187,7 +188,11 @@ public class TriggerCallbackThread {
private
void
callbackLog
(
List
<
HandleCallbackParam
>
callbackParamList
,
String
logContent
){
private
void
callbackLog
(
List
<
HandleCallbackParam
>
callbackParamList
,
String
logContent
){
for
(
HandleCallbackParam
callbackParam:
callbackParamList
)
{
for
(
HandleCallbackParam
callbackParam:
callbackParamList
)
{
String
logFileName
=
XxlJobFileAppender
.
makeLogFileName
(
new
Date
(
callbackParam
.
getLogDateTim
()),
callbackParam
.
getLogId
());
String
logFileName
=
XxlJobFileAppender
.
makeLogFileName
(
new
Date
(
callbackParam
.
getLogDateTim
()),
callbackParam
.
getLogId
());
XxlJobFileAppender
.
contextHolder
.
set
(
logFileName
);
XxlJobContext
.
setXxlJobContext
(
new
XxlJobContext
(
-
1
,
logFileName
,
-
1
,
-
1
));
XxlJobLogger
.
log
(
logContent
);
XxlJobLogger
.
log
(
logContent
);
}
}
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论