ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HTTP远程调度交互重构

This commit is contained in:
xueli.xue 2016-03-12 18:04:57 +08:00
parent 1b6b8c2038
commit 53fd312d37
8 changed files with 83 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xxl-job-admin/src/main/java/com/xxl/job/controller/JobLogController.java
View File

@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.xxl.job.client.util.HttpUtil.RemoteCallBack;
import com.xxl.job.core.constant.Constants.JobGroupEnum;
import com.xxl.job.core.model.ReturnT;
import com.xxl.job.core.model.XxlJobLog;
import com.xxl.job.dao.IXxlJobLogDao;
@ -73,16 +73,19 @@ public class JobLogController {
@RequestMapping("/save")
@ResponseBody
public ReturnT<String> triggerLog(int trigger_log_id, String status, String msg) {
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);
return ReturnT.SUCCESS;
callBack.setStatus(RemoteCallBack.SUCCESS);
return callBack;
}
return ReturnT.FAIL;
return callBack;
}
}

8
xxl-job-admin/src/main/java/com/xxl/job/core/thread/JobMonitorHelper.java
View File

@ -11,7 +11,7 @@ import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.xxl.job.client.util.HttpUtil;
import com.xxl.job.client.util.HttpUtil.RemoteCallBack;
import com.xxl.job.core.model.XxlJobInfo;
import com.xxl.job.core.model.XxlJobLog;
import com.xxl.job.core.util.DynamicSchedulerUtil;
@ -40,13 +40,13 @@ public class JobMonitorHelper {
if (jobLogId != null && jobLogId > 0) {
XxlJobLog log = DynamicSchedulerUtil.xxlJobLogDao.load(jobLogId);
if (log!=null) {
if (HttpUtil.SUCCESS.equals(log.getTriggerStatus()) && StringUtils.isBlank(log.getHandleStatus())) {
if (RemoteCallBack.SUCCESS.equals(log.getTriggerStatus()) && StringUtils.isBlank(log.getHandleStatus())) {
JobMonitorHelper.monitor(jobLogId);
}
if (HttpUtil.SUCCESS.equals(log.getTriggerStatus()) && HttpUtil.SUCCESS.equals(log.getHandleStatus())) {
if (RemoteCallBack.SUCCESS.equals(log.getTriggerStatus()) && RemoteCallBack.SUCCESS.equals(log.getHandleStatus())) {
// pass
}
if (HttpUtil.FAIL.equals(log.getTriggerStatus()) || HttpUtil.FAIL.equals(log.getHandleStatus())) {
if (RemoteCallBack.FAIL.equals(log.getTriggerStatus()) || RemoteCallBack.FAIL.equals(log.getHandleStatus())) {
String monotorKey = log.getJobGroup().concat("_").concat(log.getJobName());
Integer count = countMap.get(monotorKey);
if (count == null) {

8
xxl-job-admin/src/main/java/com/xxl/job/service/job/LocalNomalJobBean.java
View File

@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.scheduling.quartz.QuartzJobBean;
import com.xxl.job.client.handler.HandlerRepository;
import com.xxl.job.client.util.HttpUtil;
import com.xxl.job.client.util.HttpUtil.RemoteCallBack;
import com.xxl.job.client.util.JacksonUtil;
import com.xxl.job.core.model.XxlJobInfo;
import com.xxl.job.core.model.XxlJobLog;
@ -60,14 +60,14 @@ public abstract class LocalNomalJobBean extends QuartzJobBean {
}
jobLog.setTriggerTime(new Date());
jobLog.setTriggerStatus(HttpUtil.SUCCESS);
jobLog.setTriggerStatus(RemoteCallBack.SUCCESS);
jobLog.setTriggerMsg(null);
try {
Object responseMsg = this.handle(handlerParams);
jobLog.setHandleTime(new Date());
jobLog.setHandleStatus(HttpUtil.SUCCESS);
jobLog.setHandleStatus(RemoteCallBack.SUCCESS);
jobLog.setHandleMsg(JacksonUtil.writeValueAsString(responseMsg));
} catch (Exception e) {
logger.info("HandlerThread Exception:", e);
@ -75,7 +75,7 @@ public abstract class LocalNomalJobBean extends QuartzJobBean {
e.printStackTrace(new PrintWriter(out));
jobLog.setHandleTime(new Date());
jobLog.setHandleStatus(HttpUtil.FAIL);
jobLog.setHandleStatus(RemoteCallBack.FAIL);
jobLog.setHandleMsg(out.toString());
}

30
xxl-job-admin/src/main/java/com/xxl/job/service/job/RemoteHttpJobBean.java
View File

@ -4,7 +4,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@ -15,6 +14,7 @@ import org.springframework.scheduling.quartz.QuartzJobBean;
import com.xxl.job.client.handler.HandlerRepository;
import com.xxl.job.client.util.HttpUtil;
import com.xxl.job.client.util.HttpUtil.RemoteCallBack;
import com.xxl.job.client.util.JacksonUtil;
import com.xxl.job.core.model.XxlJobInfo;
import com.xxl.job.core.model.XxlJobLog;
@ -60,35 +60,25 @@ public class RemoteHttpJobBean extends QuartzJobBean {
params.put(HandlerRepository.HANDLER_NAME, jobDataMap.get(HandlerRepository.HANDLER_NAME));
params.put(HandlerRepository.HANDLER_PARAMS, jobDataMap.get(HandlerRepository.HANDLER_PARAMS));
// handler address, netty or servlet
// handler address, jetty or servlet
String handler_address = jobDataMap.get(HandlerRepository.HANDLER_ADDRESS);
if (!handler_address.startsWith("http")){
handler_address = "http://" + handler_address + "/";
}
String[] postResp = HttpUtil.post(handler_address, params);
logger.info(">>>>>>>>>>> xxl-job trigger http response, jobLog.id:{}, jobLog:{}", jobLog.getId(), jobLog);
// parse trigger response
String responseMsg = postResp[0];
String exceptionMsg = postResp[1];
jobLog.setTriggerTime(new Date());
jobLog.setTriggerStatus(HttpUtil.FAIL);
jobLog.setTriggerMsg("[responseMsg]:"+responseMsg+"<br>[exceptionMsg]:"+exceptionMsg);
if (StringUtils.isNotBlank(responseMsg) && responseMsg.indexOf("{")>-1 ) {
Map<String, String> responseMap = JacksonUtil.readValue(responseMsg, Map.class);
if (responseMap!=null && StringUtils.isNotBlank(responseMap.get(HttpUtil.status))) {
jobLog.setTriggerStatus(responseMap.get(HttpUtil.status));
jobLog.setTriggerMsg(responseMap.get(HttpUtil.msg));
}
}
RemoteCallBack callback = HttpUtil.post(handler_address, params);
logger.info(">>>>>>>>>>> xxl-job trigger http response, jobLog.id:{}, jobLog:{}, callback:{}", jobLog.getId(), jobLog, callback);
// update trigger info
jobLog.setTriggerTime(new Date());
jobLog.setTriggerStatus(callback.getStatus());
jobLog.setTriggerMsg(callback.getMsg());
DynamicSchedulerUtil.xxlJobLogDao.updateTriggerInfo(jobLog);
// monitor triger
JobMonitorHelper.monitor(jobLog.getId());
logger.info(">>>>>>>>>>> xxl-job trigger end, jobLog.id:{}, jobLog:{}", jobLog.getId(), jobLog);
}
}

4
xxl-job-admin/src/test/java/com/xxl/job/dao/impl/XxlJobLogTest.java
View File

@ -11,7 +11,7 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.xxl.job.client.handler.IJobHandler;
import com.xxl.job.client.util.HttpUtil;
import com.xxl.job.client.util.HttpUtil.RemoteCallBack;
import com.xxl.job.core.model.XxlJobLog;
import com.xxl.job.dao.IXxlJobLogDao;
@ -41,7 +41,7 @@ public class XxlJobLogTest {
public void updateTriggerInfo(){
XxlJobLog xxlJobLog = xxlJobLogDao.load(29);
xxlJobLog.setTriggerTime(new Date());
xxlJobLog.setTriggerStatus(HttpUtil.SUCCESS);
xxlJobLog.setTriggerStatus(RemoteCallBack.SUCCESS);
xxlJobLog.setTriggerMsg("trigger msg");
xxlJobLogDao.updateTriggerInfo(xxlJobLog);
}

25
xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerRepository.java
View File

@ -1,13 +1,12 @@
package com.xxl.job.client.handler;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.xxl.job.client.util.HttpUtil;
import com.xxl.job.client.util.HttpUtil.RemoteCallBack;
import com.xxl.job.client.util.JacksonUtil;
/**
@ -38,9 +37,9 @@ public class HandlerRepository {
public static String pushHandleQueue(Map<String, String> _param) {
logger.info(">>>>>>>>>>> xxl-job pushHandleQueue start, _param:{}", new Object[]{_param});
// result
String _status = HttpUtil.FAIL;
String _msg = "";
// callback
RemoteCallBack callback = new RemoteCallBack();
callback.setStatus(RemoteCallBack.FAIL);
// push data to queue
String handler_name = _param.get(HandlerRepository.HANDLER_NAME);
@ -48,22 +47,16 @@ public class HandlerRepository {
HandlerThread handlerThread = handlerTreadMap.get(handler_name);
if (handlerThread != null) {
handlerThread.pushData(_param);
_status = HttpUtil.SUCCESS;
callback.setStatus(RemoteCallBack.SUCCESS);
} else {
_msg = "handler not found.";
callback.setMsg("handler[" + handler_name + "] not found.");
}
}else{
_msg = "param[HANDLER_NAME] not exists.";
callback.setMsg("param[HANDLER_NAME] can not be null.");
}
HashMap<String, String> triggerData = new HashMap<String, String>();
triggerData.put(HandlerRepository.TRIGGER_LOG_ID, _param.get(HandlerRepository.TRIGGER_LOG_ID));
triggerData.put(HttpUtil.status, _status);
triggerData.put(HttpUtil.msg, _msg);
logger.info(">>>>>>>>>>> xxl-job pushHandleQueue end, triggerData:{}", new Object[]{triggerData});
return JacksonUtil.writeValueAsString(triggerData);
logger.info(">>>>>>>>>>> xxl-job pushHandleQueue end, triggerData:{}", new Object[]{callback});
return JacksonUtil.writeValueAsString(callback);
}
}

13
xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java
View File

@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
import com.xxl.job.client.handler.IJobHandler.JobHandleStatus;
import com.xxl.job.client.util.HttpUtil;
import com.xxl.job.client.util.HttpUtil.RemoteCallBack;
/**
* handler thread
@ -65,19 +66,19 @@ public class HandlerThread extends Thread{
}
// callback handler info
String callback_response[] = null;
RemoteCallBack callback = null;
try {
HashMap<String, String> params = new HashMap<String, String>();
params.put(HandlerRepository.TRIGGER_LOG_ID, trigger_log_id);
params.put(HttpUtil.status, _status.name());
params.put(HttpUtil.msg, _msg);
callback_response = HttpUtil.post(trigger_log_url, params);
params.put("status", _status.name());
params.put("msg", _msg);
callback = HttpUtil.post(trigger_log_url, params);
} catch (Exception e) {
logger.info("HandlerThread Exception:", e);
}
logger.info("<<<<<<<<<<< xxl-job thread handle, handlerData:{}, callback_status:{}, callback_msg:{}, callback_response:{}, thread:{}",
new Object[]{handlerData, _status, _msg, callback_response, this});
logger.info("<<<<<<<<<<< xxl-job thread handle, handlerData:{}, callback_status:{}, callback_msg:{}, callback:{}, thread:{}",
new Object[]{handlerData, _status, _msg, callback, this});
} else {
try {
TimeUnit.MILLISECONDS.sleep(i * 100);

50
xxl-job-client/src/main/java/com/xxl/job/client/util/HttpUtil.java
View File

@ -25,22 +25,38 @@ import org.apache.http.util.EntityUtils;
*/
public class HttpUtil {
// response param
public static final String status = "status";
public static final String msg = "msg";
// response status enum
/**
* http remote callback
*/
public static class RemoteCallBack{
public static final String SUCCESS = "SUCCESS";
public static final String FAIL = "FAIL";
private String status;
private String msg;
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setMsg(String msg) {
this.msg = msg;
}
public String getMsg() {
return msg;
}
}
/**
* http post request
* @param reqURL
* @param params
* @return [0]=responseMsg, [1]=exceptionMsg
*/
public static String[] post(String reqURL, Map<String, String> params){
String responseMsg = null;
String exceptionMsg = null;
public static RemoteCallBack post(String reqURL, Map<String, String> params){
RemoteCallBack callback = new RemoteCallBack();
callback.setStatus(RemoteCallBack.FAIL);
// do post
HttpPost httpPost = null;
@ -60,18 +76,25 @@ public class HttpUtil {
HttpResponse response = httpClient.execute(httpPost);
HttpEntity entity = response.getEntity();
if (response.getStatusLine().getStatusCode() == 200) {
if (null != entity) {
responseMsg = EntityUtils.toString(entity, "UTF-8");
String responseMsg = EntityUtils.toString(entity, "UTF-8");
callback = JacksonUtil.readValue(responseMsg, RemoteCallBack.class);
if (callback == null) {
callback = new RemoteCallBack();
callback.setStatus(RemoteCallBack.FAIL);
callback.setMsg("responseMsg parse json fail, responseMsg:" + responseMsg);
}
EntityUtils.consume(entity);
}
if (response.getStatusLine().getStatusCode() != 200) {
exceptionMsg = "response.getStatusLine().getStatusCode() = " + response.getStatusLine().getStatusCode();
} else {
callback.setMsg("http statusCode error, statusCode:" + response.getStatusLine().getStatusCode());
}
} catch (Exception e) {
e.printStackTrace();
StringWriter out = new StringWriter();
e.printStackTrace(new PrintWriter(out));
exceptionMsg = out.toString();
callback.setMsg(out.toString());
} finally{
if (httpPost!=null) {
httpPost.releaseConnection();
@ -85,9 +108,6 @@ public class HttpUtil {
}
}
String[] result = new String[2];
result[0] = responseMsg;
result[1] = exceptionMsg;
return result;
return callback;
}
}