Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
X
XXL-JOB
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
靳帅
XXL-JOB
Commits
859207d0
提交
859207d0
authored
2月 24, 2017
作者:
xueli.xue
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
底层日志底层日志调整,非敏感日志level调整为debug;
上级
6b91f408
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
22 行增加
和
41 行删除
+22
-41
README.md
README.md
+2
-0
JobLogController.java
...n/java/com/xxl/job/admin/controller/JobLogController.java
+0
-19
WebExceptionResolver.java
...l/job/admin/controller/resolver/WebExceptionResolver.java
+1
-1
XxlJobLogCallbackServer.java
.../xxl/job/admin/core/callback/XxlJobLogCallbackServer.java
+1
-1
RemoteHttpJobBean.java
...ava/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java
+2
-2
JobMonitorHelper.java
.../java/com/xxl/job/admin/core/thread/JobMonitorHelper.java
+1
-1
DbRegistHelper.java
...n/java/com/xxl/job/core/registry/impl/DbRegistHelper.java
+1
-1
JobThread.java
...c/main/java/com/xxl/job/core/router/thread/JobThread.java
+6
-8
TriggerCallbackThread.java
...com/xxl/job/core/router/thread/TriggerCallbackThread.java
+1
-1
IpUtil.java
xxl-job-core/src/main/java/com/xxl/job/core/util/IpUtil.java
+4
-4
XxlJobNetCommUtil.java
...rc/main/java/com/xxl/job/core/util/XxlJobNetCommUtil.java
+3
-3
没有找到文件。
README.md
浏览文件 @
859207d0
...
...
@@ -708,6 +708,8 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
-
1、IP工具类获取IP逻辑优化,IP静态缓存;
-
2、执行器、调度中心,均支持自定义注册IP地址;解决机器多网卡时错误网卡注册的情况;
-
3、任务跨天执行时生成多份日志文件的问题修复;
-
4、底层日志底层日志调整,非敏感日志level调整为debug;
-
5、执行器AppName必须在调度中心配置才允许注册,一个AppName可以配置多个执行器,将会同时注册到对应执行器上;
#### 规划中
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java
浏览文件 @
859207d0
...
...
@@ -45,7 +45,6 @@ public class JobLogController {
public
String
index
(
Model
model
,
String
jobGroup
,
String
jobName
)
{
// 任务组
List
<
XxlJobGroup
>
jobGroupList
=
xxlJobGroupDao
.
findAll
();
model
.
addAttribute
(
"jobGroup"
,
jobGroup
);
...
...
@@ -92,24 +91,6 @@ public class JobLogController {
return
maps
;
}
/*@RequestMapping("/save")
@ResponseBody
@PermessionLimit(limit=false)
public RemoteCallBack triggerLog(int trigger_log_id, String status, String msg) {
RemoteCallBack callBack = new RemoteCallBack();
callBack.setStatus(RemoteCallBack.FAIL);
XxlJobLog log = xxlJobLogDao.load(trigger_log_id);
if (log!=null) {
log.setHandleTime(new Date());
log.setHandleStatus(status);
log.setHandleMsg(msg);
xxlJobLogDao.updateHandleInfo(log);
callBack.setStatus(RemoteCallBack.SUCCESS);
return callBack;
}
return callBack;
}*/
@RequestMapping
(
"/logDetail"
)
@ResponseBody
public
ReturnT
<
String
>
logDetail
(
int
id
){
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java
浏览文件 @
859207d0
...
...
@@ -22,7 +22,7 @@ public class WebExceptionResolver implements HandlerExceptionResolver {
@Override
public
ModelAndView
resolveException
(
HttpServletRequest
request
,
HttpServletResponse
response
,
Object
handler
,
Exception
ex
)
{
logger
.
error
(
"
system catch exception
:{}"
,
ex
);
logger
.
error
(
"
WebExceptionResolver
:{}"
,
ex
);
ModelAndView
mv
=
new
ModelAndView
();
HandlerMethod
method
=
(
HandlerMethod
)
handler
;
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/callback/XxlJobLogCallbackServer.java
浏览文件 @
859207d0
...
...
@@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory;
public
class
XxlJobLogCallbackServer
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
XxlJobLogCallbackServer
.
class
);
Server
server
=
null
;
private
Server
server
=
null
;
public
void
start
(
int
callBackPort
)
throws
Exception
{
final
int
port
=
Integer
.
valueOf
(
callBackPort
);
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java
浏览文件 @
859207d0
...
...
@@ -42,7 +42,7 @@ public class RemoteHttpJobBean extends QuartzJobBean {
jobLog
.
setJobGroup
(
jobInfo
.
getJobGroup
());
jobLog
.
setJobName
(
jobInfo
.
getJobName
());
DynamicSchedulerUtil
.
xxlJobLogDao
.
save
(
jobLog
);
logger
.
info
(
">>>>>>>>>>> xxl-job trigger start, jobId:{}"
,
jobLog
.
getId
());
logger
.
debug
(
">>>>>>>>>>> xxl-job trigger start, jobId:{}"
,
jobLog
.
getId
());
// admin address
List
<
String
>
adminAddressList
=
JobRegistryHelper
.
discover
(
RegistHelper
.
RegistType
.
ADMIN
.
name
(),
RegistHelper
.
RegistType
.
ADMIN
.
name
());
...
...
@@ -89,7 +89,7 @@ public class RemoteHttpJobBean extends QuartzJobBean {
// monitor triger
JobMonitorHelper
.
monitor
(
jobLog
.
getId
());
logger
.
info
(
">>>>>>>>>>> xxl-job trigger end, jobId:{}"
,
jobLog
.
getId
());
logger
.
debug
(
">>>>>>>>>>> xxl-job trigger end, jobId:{}"
,
jobLog
.
getId
());
}
...
...
xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobMonitorHelper.java
浏览文件 @
859207d0
...
...
@@ -35,7 +35,7 @@ public class JobMonitorHelper {
public
void
run
()
{
while
(
true
)
{
try
{
logger
.
info
(
">>>>>>>>>>> job monitor beat ... "
);
logger
.
debug
(
">>>>>>>>>>> job monitor beat ... "
);
Integer
jobLogId
=
JobMonitorHelper
.
helper
.
queue
.
take
();
if
(
jobLogId
!=
null
&&
jobLogId
>
0
)
{
logger
.
info
(
">>>>>>>>>>> job monitor heat success, JobLogId:{}"
,
jobLogId
);
...
...
xxl-job-core/src/main/java/com/xxl/job/core/registry/impl/DbRegistHelper.java
浏览文件 @
859207d0
...
...
@@ -21,7 +21,7 @@ public class DbRegistHelper implements RegistHelper {
String
insertSql
=
"INSERT INTO XXL_JOB_QRTZ_TRIGGER_REGISTRY( `registry_group` , `registry_key` , `registry_value`, `update_time`) VALUES(? , ? , ?, NOW())"
;
int
ret
=
DBUtil
.
update
(
dataSource
,
updateSql
,
new
Object
[]{
registGroup
,
registryKey
,
registryValue
});
if
(
ret
<
1
)
{
ret
=
DBUtil
.
update
(
dataSource
,
insertSql
,
new
Object
[]{
registGroup
,
registryKey
,
registryValue
});
//
ret = DBUtil.update(dataSource, insertSql, new Object[]{registGroup, registryKey, registryValue});
}
return
ret
;
}
...
...
xxl-job-core/src/main/java/com/xxl/job/core/router/thread/JobThread.java
浏览文件 @
859207d0
...
...
@@ -40,7 +40,7 @@ public class JobThread extends Thread{
public
void
pushTriggerQueue
(
RequestModel
requestModel
)
{
if
(
triggerLogIdSet
.
contains
(
requestModel
.
getLogId
()))
{
logger
.
info
(
"repeate trigger job, logId:{}"
,
requestModel
.
getLogId
());
logger
.
debug
(
"repeate trigger job, logId:{}"
,
requestModel
.
getLogId
());
return
;
}
...
...
@@ -58,8 +58,6 @@ public class JobThread extends Thread{
this
.
stopReason
=
stopReason
;
}
int
i
=
1
;
@Override
public
void
run
()
{
...
...
@@ -83,16 +81,16 @@ public class JobThread extends Thread{
String
logFileName
=
XxlJobFileAppender
.
makeLogFileName
(
new
Date
(
triggerDate
.
getLogDateTim
()),
triggerDate
.
getLogId
());
XxlJobFileAppender
.
contextHolder
.
set
(
logFileName
);
logger
.
info
(
"----------- xxl-job job
handl
e start -----------"
);
logger
.
info
(
"----------- xxl-job job
execut
e start -----------"
);
handler
.
execute
(
handlerParams
);
}
catch
(
Exception
e
)
{
logger
.
info
(
"JobThread Exception:"
,
e
);
logger
.
error
(
"JobThread Exception:"
,
e
);
_status
=
ResponseModel
.
FAIL
;
StringWriter
out
=
new
StringWriter
();
e
.
printStackTrace
(
new
PrintWriter
(
out
));
_msg
=
out
.
toString
();
}
logger
.
info
(
"----------- xxl-job job
handl
e end ----------- <br> Look : ExecutorParams:{}, Status:{}, Msg:{}"
,
logger
.
info
(
"----------- xxl-job job
execut
e end ----------- <br> Look : ExecutorParams:{}, Status:{}, Msg:{}"
,
new
Object
[]{
handlerParams
,
_status
,
_msg
});
// callback handler info
...
...
@@ -109,7 +107,7 @@ public class JobThread extends Thread{
}
}
}
catch
(
Exception
e
)
{
logger
.
info
(
"
JobThread Exception:"
,
e
);
logger
.
error
(
"----------- xxl-job
JobThread Exception:"
,
e
);
}
}
...
...
@@ -124,6 +122,6 @@ public class JobThread extends Thread{
}
}
logger
.
info
(
">>>>>>>>>>>> xxl-job
handlerThr
ad stoped, hashCode:{}"
,
Thread
.
currentThread
());
logger
.
info
(
">>>>>>>>>>>> xxl-job
JobThre
ad stoped, hashCode:{}"
,
Thread
.
currentThread
());
}
}
xxl-job-core/src/main/java/com/xxl/job/core/router/thread/TriggerCallbackThread.java
浏览文件 @
859207d0
...
...
@@ -31,7 +31,7 @@ public class TriggerCallbackThread {
break
;
}
}
catch
(
Exception
e
)
{
logger
.
info
(
"Job
Thread Exception:"
,
e
);
logger
.
error
(
">>>>>>>>>>> xxl-job TriggerCallback
Thread Exception:"
,
e
);
}
}
}
...
...
xxl-job-core/src/main/java/com/xxl/job/core/util/IpUtil.java
浏览文件 @
859207d0
...
...
@@ -49,7 +49,7 @@ public class IpUtil {
return
localAddress
;
}
}
catch
(
Throwable
e
)
{
logger
.
warn
(
"Failed to retriving ip address, "
+
e
.
getMessage
(),
e
);
logger
.
error
(
"Failed to retriving ip address, "
+
e
.
getMessage
(),
e
);
}
try
{
Enumeration
<
NetworkInterface
>
interfaces
=
NetworkInterface
.
getNetworkInterfaces
();
...
...
@@ -66,17 +66,17 @@ public class IpUtil {
return
address
;
}
}
catch
(
Throwable
e
)
{
logger
.
warn
(
"Failed to retriving ip address, "
+
e
.
getMessage
(),
e
);
logger
.
error
(
"Failed to retriving ip address, "
+
e
.
getMessage
(),
e
);
}
}
}
}
catch
(
Throwable
e
)
{
logger
.
warn
(
"Failed to retriving ip address, "
+
e
.
getMessage
(),
e
);
logger
.
error
(
"Failed to retriving ip address, "
+
e
.
getMessage
(),
e
);
}
}
}
}
catch
(
Throwable
e
)
{
logger
.
warn
(
"Failed to retriving ip address, "
+
e
.
getMessage
(),
e
);
logger
.
error
(
"Failed to retriving ip address, "
+
e
.
getMessage
(),
e
);
}
logger
.
error
(
"Could not get local host ip address, will use 127.0.0.1 instead."
);
return
localAddress
;
...
...
xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobNetCommUtil.java
浏览文件 @
859207d0
...
...
@@ -112,7 +112,7 @@ public class XxlJobNetCommUtil {
HttpEntity
entity
=
response
.
getEntity
();
if
(
response
.
getStatusLine
().
getStatusCode
()
==
200
&&
null
!=
entity
)
{
String
responseHex
=
EntityUtils
.
toString
(
entity
,
"UTF-8"
);
logger
.
info
(
"xxl-job, net comm success, requestHex:{}, responseHex:{}"
,
requestHex
,
responseHex
);
logger
.
debug
(
"xxl-job, net comm success, requestHex:{}, responseHex:{}"
,
requestHex
,
responseHex
);
EntityUtils
.
consume
(
entity
);
// i do not know why
...
...
@@ -133,7 +133,7 @@ public class XxlJobNetCommUtil {
failMsg
=
"http statusCode error, statusCode:"
+
response
.
getStatusLine
().
getStatusCode
();
}
}
catch
(
Exception
e
)
{
logger
.
info
(
""
,
e
);
logger
.
error
(
""
,
e
);
/*StringWriter out = new StringWriter();
e.printStackTrace(new PrintWriter(out));
callback.setMsg(out.toString());*/
...
...
@@ -146,7 +146,7 @@ public class XxlJobNetCommUtil {
try
{
httpClient
.
close
();
}
catch
(
IOException
e
)
{
logger
.
info
(
""
,
e
);
logger
.
error
(
""
,
e
);
}
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论