Commit 57104d46 by huangfusuper

执行节点监控

parent 63bcbcf5
...@@ -27,6 +27,7 @@ import com.byit.service.JobTaskRunLogService; ...@@ -27,6 +27,7 @@ import com.byit.service.JobTaskRunLogService;
import com.byit.task.JavaNodeExecutorTask; import com.byit.task.JavaNodeExecutorTask;
import com.byit.task.JavaTaskJobTask; import com.byit.task.JavaTaskJobTask;
import com.byit.task.ScriptExecutorJobTask; import com.byit.task.ScriptExecutorJobTask;
import com.byit.util.IDGenerationStrategy;
import com.byit.utils.ValidationUtil; import com.byit.utils.ValidationUtil;
import io.netty.util.TimerTask; import io.netty.util.TimerTask;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -122,7 +123,7 @@ public class ApiNodeServiceImpl implements ApiNodeService { ...@@ -122,7 +123,7 @@ public class ApiNodeServiceImpl implements ApiNodeService {
schedule.setLogId(logId); schedule.setLogId(logId);
RunLog runLog = RunLog.builder().isEnd(false).runLog("等待服务器分配资源").build(); RunLog runLog = RunLog.builder().isEnd(false).runLog("等待服务器分配资源").build();
String runKey = "REAL:EXEC:" + logId; String runKey = IDGenerationStrategy.keyGenerationStrategy(logId);
stringRedisTemplate.opsForList().rightPush(runKey, JSON.toJSONString(runLog, WriteClassName)); stringRedisTemplate.opsForList().rightPush(runKey, JSON.toJSONString(runLog, WriteClassName));
TimerTask timerTask; TimerTask timerTask;
if (NodeTypeEnum.JAVA.getCode().equals(runNode.getJobType())) { if (NodeTypeEnum.JAVA.getCode().equals(runNode.getJobType())) {
......
...@@ -6,6 +6,7 @@ import com.byit.dto.plugin.RunLog; ...@@ -6,6 +6,7 @@ import com.byit.dto.plugin.RunLog;
import com.byit.model.JobTaskRunLog; import com.byit.model.JobTaskRunLog;
import com.byit.service.JobTaskRunLogService; import com.byit.service.JobTaskRunLogService;
import com.byit.thread.BaseThreadRunHelper; import com.byit.thread.BaseThreadRunHelper;
import com.byit.util.IDGenerationStrategy;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -40,10 +41,10 @@ public class UnfinishedNodeMonitoringRunHelper extends BaseThreadRunHelper { ...@@ -40,10 +41,10 @@ public class UnfinishedNodeMonitoringRunHelper extends BaseThreadRunHelper {
List<JobTaskRunLog> tempRunNodeList = jobTaskRunLogService.findTempRunNodeList(); List<JobTaskRunLog> tempRunNodeList = jobTaskRunLogService.findTempRunNodeList();
if (CollectionUtil.isNotEmpty(tempRunNodeList)) { if (CollectionUtil.isNotEmpty(tempRunNodeList)) {
tempRunNodeList.forEach(nodeLog -> { tempRunNodeList.forEach(nodeLog -> {
log.debug("-----节点{}未执行完毕-----",nodeLog); log.debug("-----节点{}未执行完毕-----", nodeLog);
String runId = nodeLog.getRunId(); String keyGenerationStrategy = IDGenerationStrategy.keyGenerationStrategy(nodeLog.getLogId());
RunLog runLog = RunLog.builder().isEnd(false).runLog(PENG).build(); RunLog runLog = RunLog.builder().isEnd(false).runLog(PENG).build();
stringRedisTemplate.opsForList().rightPush(runId, JSON.toJSONString(runLog, WriteClassName)); stringRedisTemplate.opsForList().rightPush(keyGenerationStrategy, JSON.toJSONString(runLog, WriteClassName));
}); });
} }
return 5000L; return 5000L;
......
...@@ -22,8 +22,7 @@ public class IDGenerationStrategy { ...@@ -22,8 +22,7 @@ public class IDGenerationStrategy {
return runIdPre; return runIdPre;
} }
public static void main(String[] args) { public static String keyGenerationStrategy(Integer logId){
System.out.println(runIdGenerationStrategy(88)); return "REAL:EXEC:" + logId;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment