将日志运行线程改为有返回值的实现方式

byit-myth-core/myth-executor-core/src/main/java/com/byit/executor/jobExecutor/process/MythJobProcess.java

@@ -15,6 +15,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -24,7 +25,7 @@ import java.util.concurrent.TimeUnit;
  * @create: 2020-01-13 17:56
  */
 @Slf4j
-public class MythJobProcess implements Runnable{
+public class MythJobProcess implements Callable<String>{
     //杀死命令
     public static String KILL_COMMAND = "kill";
     //工作目录
@@ -49,10 +50,6 @@ public class MythJobProcess implements Runnable{
     private String effectiveUser = null;
     //本次任务对应的日志id
     private Integer logId;
-    //执行日志内容
-    private String logFilePath;
-    //上传日志工具类
-    private FileSystemContext fileSystemContext;
 
     public MythJobProcess(final List<String> cmd, final Map<String, String> env,
                           final String workingDir, final Integer logId) {
@@ -79,7 +76,7 @@ public class MythJobProcess implements Runnable{
      */
     @SneakyThrows
     @Override
-    public void run() {
+    public String call() {
         //判断是否执行过
         if (this.isStarted() || this.isComplete()) {
             throw new IllegalStateException("该过程只能使用一次");
@@ -145,8 +142,7 @@ public class MythJobProcess implements Runnable{
             if (this.process.isAlive()){
                 this.process.destroy();
             }
-            logFilePath = outputGobbler.getRecentLog() + "\n" + errorGobbler.getRecentLog();
-            //TODO 将日志写到fastdfs上
+            return  outputGobbler.getRecentLog() + "\n" + errorGobbler.getRecentLog();
         }
     }
 
@@ -301,8 +297,4 @@ public class MythJobProcess implements Runnable{
     public String getEffectiveUser() {
         return this.effectiveUser;
     }
-
-    public String getLogContent(){
-        return logFilePath;
-    }
 }