parent
eb4132167e
commit
191d5ceeb3
|
@ -196,11 +196,7 @@ $(function() {
|
||||||
ComConfirm.show("确认主动终止任务?", function(){
|
ComConfirm.show("确认主动终止任务?", function(){
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type : 'POST',
|
type : 'POST',
|
||||||
<<<<<<< HEAD
|
|
||||||
url : base_url + 'joblog/logKill',
|
url : base_url + 'joblog/logKill',
|
||||||
=======
|
|
||||||
url : base_url + 'joblog/ferrariJobKill',
|
|
||||||
>>>>>>> branch 'master' of https://github.com/xuxueli/xxl-job.git
|
|
||||||
data : {"id":_id},
|
data : {"id":_id},
|
||||||
dataType : "json",
|
dataType : "json",
|
||||||
success : function(data){
|
success : function(data){
|
||||||
|
|
|
@ -97,7 +97,7 @@ public class HandlerThread extends Thread{
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.info("HandlerThread Exception:", e);
|
logger.info("HandlerThread Exception:", e);
|
||||||
}
|
}
|
||||||
logger.info("<<<<<<<<<<< xxl-job thread handle, handlerData:{}, callback_status:{}, callback_msg:{}, callback:{}, thread:{}",
|
logger.info(">>>>>>>>>>> xxl-job thread handle, handlerData:{}, callback_status:{}, callback_msg:{}, callback:{}, thread:{}",
|
||||||
new Object[]{handlerData, _status, _msg, callback, this});
|
new Object[]{handlerData, _status, _msg, callback, this});
|
||||||
} else {
|
} else {
|
||||||
i++;
|
i++;
|
||||||
|
|
Loading…
Reference in New Issue