diff --git a/powerjob-client/pom.xml b/powerjob-client/pom.xml index 28d2b152..f417811f 100644 --- a/powerjob-client/pom.xml +++ b/powerjob-client/pom.xml @@ -10,13 +10,13 @@ 4.0.0 powerjob-client - 3.4.7 + 3.4.8 jar 5.6.1 1.2.68 - 3.4.7 + 3.4.8 3.2.4 diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml index a45cd012..3b980ceb 100644 --- a/powerjob-common/pom.xml +++ b/powerjob-common/pom.xml @@ -10,7 +10,7 @@ 4.0.0 powerjob-common - 3.4.7 + 3.4.8 jar diff --git a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/PowerJobDKey.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/PowerJobDKey.java index f7a1bacf..9a786b3b 100644 --- a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/PowerJobDKey.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/PowerJobDKey.java @@ -16,6 +16,8 @@ public class PowerJobDKey { */ public static final String PREFERRED_NETWORK_INTERFACE = "powerjob.network.interface.preferred"; + public static final String BIND_LOCAL_ADDRESS = "powerjob.network.local.address"; + /** * Java regular expressions for network interfaces that will be ignored. */ diff --git a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/NetUtils.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/NetUtils.java index 453932b0..58dff171 100644 --- a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/NetUtils.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/utils/NetUtils.java @@ -60,6 +60,12 @@ public class NetUtils { return HOST_ADDRESS; } + String addressFromJVM = System.getProperty(PowerJobDKey.BIND_LOCAL_ADDRESS); + if (StringUtils.isNotEmpty(addressFromJVM)) { + log.info("[Net] use address from[{}]: {}", PowerJobDKey.BIND_LOCAL_ADDRESS, addressFromJVM); + return HOST_ADDRESS = addressFromJVM; + } + InetAddress address = getLocalAddress(); if (address != null) { return HOST_ADDRESS = address.getHostAddress(); diff --git a/powerjob-official-processors/pom.xml b/powerjob-official-processors/pom.xml index 5e11dc48..73da08d0 100644 --- a/powerjob-official-processors/pom.xml +++ b/powerjob-official-processors/pom.xml @@ -10,7 +10,7 @@ 4.0.0 powerjob-official-processors - 1.0.1 + 1.0.3 jar @@ -102,6 +102,9 @@ org shade.powerjob.org + + org.slf4j.* + com.google diff --git a/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/CommonBasicProcessor.java b/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/CommonBasicProcessor.java index cbac4c98..346db9c2 100644 --- a/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/CommonBasicProcessor.java +++ b/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/CommonBasicProcessor.java @@ -19,16 +19,16 @@ import tech.powerjob.official.processors.util.CommonUtils; public abstract class CommonBasicProcessor implements BasicProcessor { @Override - public ProcessResult process(TaskContext taskContext) throws Exception { + public ProcessResult process(TaskContext ctx) throws Exception { String status = "unknown"; Stopwatch sw = Stopwatch.createStarted(); - OmsLogger omsLogger = taskContext.getOmsLogger(); - omsLogger.info("using params: {}", CommonUtils.parseParams(taskContext)); + OmsLogger omsLogger = ctx.getOmsLogger(); + omsLogger.info("using params: {}", CommonUtils.parseParams(ctx)); try { - ProcessResult result = process0(taskContext); + ProcessResult result = process0(ctx); omsLogger.info("execute succeed, using {}, result: {}", sw, result); status = result.isSuccess() ? "succeed" : "failed"; return result; @@ -37,7 +37,7 @@ public abstract class CommonBasicProcessor implements BasicProcessor { omsLogger.error("execute failed!", t); return new ProcessResult(false, ExceptionUtils.getMessage(t)); } finally { - log.info("status: {}, cost: {}", status, sw); + log.info("{}|{}|{}|{}|{}", getClass().getSimpleName(), ctx.getJobId(), ctx.getInstanceId(), status, sw); } } diff --git a/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/script/AbstractScriptProcessor.java b/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/script/AbstractScriptProcessor.java index b81b4bb2..8cef3bc4 100644 --- a/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/script/AbstractScriptProcessor.java +++ b/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/script/AbstractScriptProcessor.java @@ -47,18 +47,22 @@ public abstract class AbstractScriptProcessor extends CommonBasicProcessor { StringBuilder inputSB = new StringBuilder(); StringBuilder errorSB = new StringBuilder(); - pool.execute(() -> copyStream(process.getInputStream(), inputSB, omsLogger)); - pool.execute(() -> copyStream(process.getErrorStream(), errorSB, omsLogger)); + boolean success = true; + String result; - try { - boolean success = process.waitFor() == 0; - String result = String.format("[INPUT]: %s;[ERROR]: %s", inputSB.toString(), errorSB.toString()); + try (InputStream is = process.getInputStream(); InputStream es = process.getErrorStream()) { - return new ProcessResult(success, result); - }catch (InterruptedException ie) { + pool.execute(() -> copyStream(is, inputSB, omsLogger)); + pool.execute(() -> copyStream(es, errorSB, omsLogger)); + + success = process.waitFor() == 0; + + } catch (InterruptedException ie) { omsLogger.info("SYSTEM ===> ScriptProcessor has been interrupted"); - return new ProcessResult(false, "Interrupted"); + } finally { + result = String.format("[INPUT]: %s;[ERROR]: %s", inputSB.toString(), errorSB.toString()); } + return new ProcessResult(success, result); } private String prepareScriptFile(Long instanceId, String processorInfo) throws IOException { diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml index 263a1930..ba5abcf8 100644 --- a/powerjob-server/pom.xml +++ b/powerjob-server/pom.xml @@ -10,13 +10,13 @@ 4.0.0 powerjob-server - 3.4.7 + 3.4.8 jar 2.9.2 2.3.4.RELEASE - 3.4.7 + 3.4.8 8.0.19 19.7.0.0 diff --git a/powerjob-server/src/main/resources/application-daily.properties b/powerjob-server/src/main/resources/application-daily.properties index d99fa81a..bb286003 100644 --- a/powerjob-server/src/main/resources/application-daily.properties +++ b/powerjob-server/src/main/resources/application-daily.properties @@ -3,7 +3,7 @@ logging.config=classpath:logback-dev.xml ####### Database properties(Configure according to the the environment) ####### spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3307/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai +spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai spring.datasource.core.username=root spring.datasource.core.password=No1Bug2Please3! spring.datasource.core.hikari.maximum-pool-size=20 diff --git a/powerjob-worker-agent/pom.xml b/powerjob-worker-agent/pom.xml index 0fc5b74a..26c23f9b 100644 --- a/powerjob-worker-agent/pom.xml +++ b/powerjob-worker-agent/pom.xml @@ -10,18 +10,18 @@ 4.0.0 powerjob-worker-agent - 3.4.7 + 3.4.8 jar - 3.4.7 + 3.4.8 1.2.3 4.3.2 2.2.6.RELEASE - 1.0.1 + 1.0.3 diff --git a/powerjob-worker-samples/pom.xml b/powerjob-worker-samples/pom.xml index b825734f..ab25f9aa 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.7 + 3.4.8 2.2.6.RELEASE - 3.4.7 + 3.4.8 1.2.68 diff --git a/powerjob-worker-spring-boot-starter/pom.xml b/powerjob-worker-spring-boot-starter/pom.xml index bfa72297..9735976e 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.7 + 3.4.8 jar - 3.4.7 + 3.4.8 2.2.6.RELEASE diff --git a/powerjob-worker/pom.xml b/powerjob-worker/pom.xml index 43430970..578745dd 100644 --- a/powerjob-worker/pom.xml +++ b/powerjob-worker/pom.xml @@ -10,12 +10,12 @@ 4.0.0 powerjob-worker - 3.4.7 + 3.4.8 jar 5.2.4.RELEASE - 3.4.7 + 3.4.8 1.4.200 3.4.2 5.6.1