|
|
@@ -30,7 +30,7 @@ import java.util.*;
|
|
30
|
30
|
//@DisallowConcurrentExecution
|
|
31
|
31
|
public class RemoteHttpJobBean extends QuartzJobBean {
|
|
32
|
32
|
private static Logger logger = LoggerFactory.getLogger(RemoteHttpJobBean.class);
|
|
33
|
|
-
|
|
|
33
|
+
|
|
34
|
34
|
@Override
|
|
35
|
35
|
protected void executeInternal(JobExecutionContext context)
|
|
36
|
36
|
throws JobExecutionException {
|
|
|
@@ -43,7 +43,15 @@ public class RemoteHttpJobBean extends QuartzJobBean {
|
|
43
|
43
|
jobLog.setJobName(jobInfo.getJobName());
|
|
44
|
44
|
DynamicSchedulerUtil.xxlJobLogDao.save(jobLog);
|
|
45
|
45
|
logger.info(">>>>>>>>>>> xxl-job trigger start, jobId:{}", jobLog.getId());
|
|
46
|
|
-
|
|
|
46
|
+
|
|
|
47
|
+ // admin address
|
|
|
48
|
+ List<String> adminAddressList = JobRegistryHelper.discover(RegistHelper.RegistType.ADMIN.name(), RegistHelper.RegistType.ADMIN.name());
|
|
|
49
|
+ Set<String> adminAddressSet = new HashSet<String>();
|
|
|
50
|
+ if (adminAddressList!=null) {
|
|
|
51
|
+ adminAddressSet.addAll(adminAddressList);
|
|
|
52
|
+ }
|
|
|
53
|
+ adminAddressSet.add(XxlJobLogCallbackServer.getTrigger_log_address());
|
|
|
54
|
+
|
|
47
|
55
|
// trigger request
|
|
48
|
56
|
RequestModel requestModel = new RequestModel();
|
|
49
|
57
|
requestModel.setTimestamp(System.currentTimeMillis());
|
|
|
@@ -53,7 +61,7 @@ public class RemoteHttpJobBean extends QuartzJobBean {
|
|
53
|
61
|
requestModel.setExecutorHandler(jobInfo.getExecutorHandler());
|
|
54
|
62
|
requestModel.setExecutorParams(jobInfo.getExecutorParam());
|
|
55
|
63
|
requestModel.setGlueSwitch((jobInfo.getGlueSwitch()==0)?false:true);
|
|
56
|
|
- requestModel.setLogAddress(XxlJobLogCallbackServer.getTrigger_log_address());
|
|
|
64
|
+ requestModel.setLogAddress(adminAddressSet);
|
|
57
|
65
|
requestModel.setLogId(jobLog.getId());
|
|
58
|
66
|
|
|
59
|
67
|
// parse address
|