From 3d1c907104002dabc9a44c431387f88e69d54bed Mon Sep 17 00:00:00 2001 From: tjq Date: Tue, 23 Feb 2021 00:20:43 +0800 Subject: [PATCH 1/3] feat: update agent's official-processor version --- powerjob-worker-agent/pom.xml | 2 +- .../com/github/kfcfans/powerjob/worker/MainApplication.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/powerjob-worker-agent/pom.xml b/powerjob-worker-agent/pom.xml index fc9097fc..b97318f8 100644 --- a/powerjob-worker-agent/pom.xml +++ b/powerjob-worker-agent/pom.xml @@ -21,7 +21,7 @@ 2.2.6.RELEASE - 1.0.0 + 1.0.1 diff --git a/powerjob-worker-agent/src/main/java/com/github/kfcfans/powerjob/worker/MainApplication.java b/powerjob-worker-agent/src/main/java/com/github/kfcfans/powerjob/worker/MainApplication.java index caebd148..a51d3b71 100644 --- a/powerjob-worker-agent/src/main/java/com/github/kfcfans/powerjob/worker/MainApplication.java +++ b/powerjob-worker-agent/src/main/java/com/github/kfcfans/powerjob/worker/MainApplication.java @@ -17,7 +17,7 @@ import picocli.CommandLine.Option; * @since 2020/5/20 */ @Slf4j -@Command(name = "OhMyAgent", mixinStandardHelpOptions = true, version = "3.4.3", description = "powerjob-worker agent") +@Command(name = "OhMyAgent", mixinStandardHelpOptions = true, version = "3.4.7", description = "powerjob-worker agent") public class MainApplication implements Runnable { @Option(names = {"-a", "--app"}, description = "worker-agent's name", required = true) From ec9519a6b2fe1b6b59851dc2232b215be7a101c6 Mon Sep 17 00:00:00 2001 From: tjq Date: Tue, 23 Feb 2021 00:40:41 +0800 Subject: [PATCH 2/3] fix: rollback ScriptProcessor to fix bug #222 --- .../core/processor/built/ScriptProcessor.java | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/ScriptProcessor.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/ScriptProcessor.java index 7d070a3e..9b84bb5f 100644 --- a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/ScriptProcessor.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/processor/built/ScriptProcessor.java @@ -8,8 +8,6 @@ import com.github.kfcfans.powerjob.worker.log.OmsLogger; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.SystemUtils; import java.io.*; import java.net.URL; @@ -46,9 +44,6 @@ public abstract class ScriptProcessor implements BasicProcessor { File dir = new File(script.getParent()); boolean success = dir.mkdirs(); - if (!success) { - throw new RuntimeException("create script folder failed."); - } success = script.createNewFile(); if (!success) { throw new RuntimeException("create script file failed"); @@ -75,18 +70,11 @@ public abstract class ScriptProcessor implements BasicProcessor { OmsLogger omsLogger = context.getOmsLogger(); omsLogger.info("SYSTEM===> ScriptProcessor start to process"); - - if (SystemUtils.IS_OS_WINDOWS) { - if (StringUtils.equals(fetchRunCommand(), "/bin/bash")) { - omsLogger.warn("Current OS is {} where shell scripts cannot run.", SystemUtils.OS_NAME); - return new ProcessResult(false, "Shell scripts cannot run on Windows"); - } - } else { - // 1. 授权 - ProcessBuilder chmodPb = new ProcessBuilder("/bin/chmod", "755", scriptPath); - // 等待返回，这里不可能导致死锁（shell产生大量数据可能导致死锁） - chmodPb.start().waitFor(); - } + + // 1. 授权 + ProcessBuilder chmodPb = new ProcessBuilder("/bin/chmod", "755", scriptPath); + // 等待返回，这里不可能导致死锁（shell产生大量数据可能导致死锁） + chmodPb.start().waitFor(); // 2. 执行目标脚本 ProcessBuilder pb = new ProcessBuilder(fetchRunCommand(), scriptPath); From b197dc4286523d238f494870f5e52e138d6b7797 Mon Sep 17 00:00:00 2001 From: tjq Date: Tue, 23 Feb 2021 00:46:03 +0800 Subject: [PATCH 3/3] chore: change pom version to 3.4.7 --- powerjob-client/pom.xml | 4 ++-- powerjob-common/pom.xml | 2 +- powerjob-official-processors/pom.xml | 2 +- powerjob-server/pom.xml | 4 ++-- powerjob-worker-agent/pom.xml | 4 ++-- powerjob-worker-samples/pom.xml | 4 ++-- powerjob-worker-spring-boot-starter/pom.xml | 4 ++-- powerjob-worker/pom.xml | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/powerjob-client/pom.xml b/powerjob-client/pom.xml index 873c16d5..28d2b152 100644 --- a/powerjob-client/pom.xml +++ b/powerjob-client/pom.xml @@ -10,13 +10,13 @@ 4.0.0 powerjob-client - 3.4.6 + 3.4.7 jar 5.6.1 1.2.68 - 3.4.6 + 3.4.7 3.2.4 diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml index fe718257..a45cd012 100644 --- a/powerjob-common/pom.xml +++ b/powerjob-common/pom.xml @@ -10,7 +10,7 @@ 4.0.0 powerjob-common - 3.4.6 + 3.4.7 jar diff --git a/powerjob-official-processors/pom.xml b/powerjob-official-processors/pom.xml index b28b61fc..5e11dc48 100644 --- a/powerjob-official-processors/pom.xml +++ b/powerjob-official-processors/pom.xml @@ -20,7 +20,7 @@ 5.6.1 1.2.3 - 3.4.6 + 3.4.7 1.2.68 diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml index 9aac61ce..263a1930 100644 --- a/powerjob-server/pom.xml +++ b/powerjob-server/pom.xml @@ -10,13 +10,13 @@ 4.0.0 powerjob-server - 3.4.6 + 3.4.7 jar 2.9.2 2.3.4.RELEASE - 3.4.6 + 3.4.7 8.0.19 19.7.0.0 diff --git a/powerjob-worker-agent/pom.xml b/powerjob-worker-agent/pom.xml index b97318f8..0fc5b74a 100644 --- a/powerjob-worker-agent/pom.xml +++ b/powerjob-worker-agent/pom.xml @@ -10,12 +10,12 @@ 4.0.0 powerjob-worker-agent - 3.4.6 + 3.4.7 jar - 3.4.6 + 3.4.7 1.2.3 4.3.2 diff --git a/powerjob-worker-samples/pom.xml b/powerjob-worker-samples/pom.xml index 9526b515..b825734f 100644 --- a/powerjob-worker-samples/pom.xml +++ b/powerjob-worker-samples/pom.xml @@ -10,11 +10,11 @@ 4.0.0 powerjob-worker-samples - 3.4.6 + 3.4.7 2.2.6.RELEASE - 3.4.6 + 3.4.7 1.2.68 diff --git a/powerjob-worker-spring-boot-starter/pom.xml b/powerjob-worker-spring-boot-starter/pom.xml index 98432094..bfa72297 100644 --- a/powerjob-worker-spring-boot-starter/pom.xml +++ b/powerjob-worker-spring-boot-starter/pom.xml @@ -10,11 +10,11 @@ 4.0.0 powerjob-worker-spring-boot-starter - 3.4.6 + 3.4.7 jar - 3.4.6 + 3.4.7 2.2.6.RELEASE diff --git a/powerjob-worker/pom.xml b/powerjob-worker/pom.xml index b4c6758a..43430970 100644 --- a/powerjob-worker/pom.xml +++ b/powerjob-worker/pom.xml @@ -10,12 +10,12 @@ 4.0.0 powerjob-worker - 3.4.6 + 3.4.7 jar 5.2.4.RELEASE - 3.4.6 + 3.4.7 1.4.200 3.4.2 5.6.1