Bladeren bron

[fix] fix template's uncorrent oms-worker version

tjq 4 jaren geleden
bovenliggende
commit
516d9697f6

BIN
oh-my-scheduler-server/src/main/resources/oms-template-origin.zip


+ 15 - 21
oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/BroadcastProcessorDemo.java

@@ -1,6 +1,6 @@
 package com.github.kfcfans.oms.samples.processors;
 
-import com.alibaba.fastjson.JSONObject;
+import com.github.kfcfans.oms.common.utils.NetUtils;
 import com.github.kfcfans.oms.worker.core.processor.ProcessResult;
 import com.github.kfcfans.oms.worker.core.processor.TaskContext;
 import com.github.kfcfans.oms.worker.core.processor.TaskResult;
@@ -9,7 +9,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * 广播处理器 示例
@@ -24,31 +23,26 @@ public class BroadcastProcessorDemo extends BroadcastProcessor {
 
     @Override
     public ProcessResult preProcess(TaskContext context) throws Exception {
-
-        System.out.println("================ BroadcastProcessorDemo#preProcess ================");
-        System.out.println("TaskContext: " + JSONObject.toJSONString(context));
-
-        boolean success = ThreadLocalRandom.current().nextBoolean();
-        return new ProcessResult(success, context + ": " + success);
+        System.out.println("===== BroadcastProcessorDemo#preProcess ======");
+        context.getOmsLogger().info("BroadcastProcessorDemo#preProcess, current host: {}", NetUtils.getLocalHost());
+        if ("rootFailed".equals(context.getJobParams())) {
+            return new ProcessResult(false, "console need failed");
+        }else {
+            return new ProcessResult(true);
+        }
     }
 
     @Override
-    public ProcessResult process(TaskContext context) throws Exception {
-        System.out.println("================ BroadcastProcessorDemo#process ================");
-        System.out.println("TaskContext: " + JSONObject.toJSONString(context));
-
-        boolean success = ThreadLocalRandom.current().nextBoolean();
-        return new ProcessResult(success, context + ": " + success);
+    public ProcessResult process(TaskContext taskContext) throws Exception {
+        System.out.println("===== BroadcastProcessorDemo#process ======");
+        taskContext.getOmsLogger().info("BroadcastProcessorDemo#process, current host: {}", NetUtils.getLocalHost());
+        return new ProcessResult(true);
     }
 
     @Override
     public ProcessResult postProcess(TaskContext context, List<TaskResult> taskResults) throws Exception {
-
-        System.out.println("================ BroadcastProcessorDemo#postProcess ================");
-        System.out.println("TaskContext: " + JSONObject.toJSONString(context));
-        System.out.println("List<TaskResult>: " + JSONObject.toJSONString(taskResults));
-
-        boolean success = ThreadLocalRandom.current().nextBoolean();
-        return new ProcessResult(success, context + ": " + success);
+        System.out.println("===== BroadcastProcessorDemo#postProcess ======");
+        context.getOmsLogger().info("BroadcastProcessorDemo#postProcess, current host: {}, taskResult: {}", NetUtils.getLocalHost(), taskResults);
+        return new ProcessResult(true, "success");
     }
 }

+ 12 - 10
oh-my-scheduler-worker-samples/src/main/java/com/github/kfcfans/oms/samples/processors/StandaloneProcessorDemo.java

@@ -1,9 +1,9 @@
 package com.github.kfcfans.oms.samples.processors;
 
-import com.alibaba.fastjson.JSONObject;
 import com.github.kfcfans.oms.worker.core.processor.ProcessResult;
 import com.github.kfcfans.oms.worker.core.processor.TaskContext;
 import com.github.kfcfans.oms.worker.core.processor.sdk.BasicProcessor;
+import com.github.kfcfans.oms.worker.log.OmsLogger;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -23,22 +23,24 @@ public class StandaloneProcessorDemo implements BasicProcessor {
     @Override
     public ProcessResult process(TaskContext context) throws Exception {
 
-        context.getOmsLogger().info("StandaloneProcessorDemo start process,context is {}.", context);
-        System.out.println("================ StandaloneProcessorDemo#process ================");
-        // 根据控制台参数判断是否成功
-        boolean success = "success".equals(context.getJobParams());
-        System.out.println("TaskContext: " + JSONObject.toJSONString(context));
-        System.out.println("ProcessSuccess: " + success);
-        context.getOmsLogger().info("StandaloneProcessorDemo finished process,success: .", success);
+        OmsLogger omsLogger = context.getOmsLogger();
+        omsLogger.info("StandaloneProcessorDemo start process,context is {}.", context);
+        omsLogger.info("Notice! If you want this job process failed, your jobParams need to be 'failed'");
 
+        omsLogger.info("Let's test the exception~");
         // 测试异常日志
         try {
             Collections.emptyList().add("277");
         }catch (Exception e) {
-            context.getOmsLogger().error("oh~it seems that we have an exception~", e);
+            omsLogger.error("oh~it seems that we have an exception~", e);
         }
 
-        context.getOmsLogger().info("anyway, we finished the job successfully~Congratulations!");
+        System.out.println("================ StandaloneProcessorDemo#process ================");
+        // 根据控制台参数判断是否成功
+        boolean success = !"failed".equals(context.getJobParams());
+        omsLogger.info("StandaloneProcessorDemo finished process,success: .", success);
+
+        omsLogger.info("anyway, we finished the job successfully~Congratulations!");
         return new ProcessResult(success, context + ": " + success);
     }
 }