Commit 9c9da3b6 by huangfusuper

调整执行机结果的设置

parent ff5b93ae
...@@ -108,6 +108,11 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService { ...@@ -108,6 +108,11 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService {
MythJobProcess mythJobProcess = new MythJobProcess(cmdList, null, null, scriptDto.getLogId(), stringRedisTemplate); MythJobProcess mythJobProcess = new MythJobProcess(cmdList, null, null, scriptDto.getLogId(), stringRedisTemplate);
//保存日志 //保存日志
String logData = mythJobProcess.call(); String logData = mythJobProcess.call();
//成功 是0 失败是其他的 杀死是-100
int exitCode = mythJobProcess.getExitCode();
if(exitCode == -100){
logData = "该任务节点已被强制kill!";
}
byte[] logDataByte = stringToByteArray(logData); byte[] logDataByte = stringToByteArray(logData);
Map<String,String> fileMateData = new HashMap<String,String>(2); Map<String,String> fileMateData = new HashMap<String,String>(2);
fileMateData.put("filename",scriptDto.getRunId()+scriptDto.getRunId()+".log"); fileMateData.put("filename",scriptDto.getRunId()+scriptDto.getRunId()+".log");
...@@ -124,9 +129,15 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService { ...@@ -124,9 +129,15 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService {
}else{ }else{
//上传日志文件 //上传日志文件
logPath = fileSystem.uploadFile(logDataByte,"log",fileMateData); logPath = fileSystem.uploadFile(logDataByte,"log",fileMateData);
}
if(exitCode == 0){
jobRunResultDto.setReturnResult(ReturnResult.SUCCESS); jobRunResultDto.setReturnResult(ReturnResult.SUCCESS);
}else{
jobRunResultDto.setReturnResult(ReturnResult.FAIL);
} }
} catch (ProcessFailureException ignored){ } catch (ProcessFailureException ignored){
jobRunResultDto.setReturnResult(ReturnResult.FAIL); jobRunResultDto.setReturnResult(ReturnResult.FAIL);
} catch (IOException | MyException e) { } catch (IOException | MyException e) {
......
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