From 5a14b300f9ff60bae8888a5f794ea57f341f212a Mon Sep 17 00:00:00 2001 From: tjq Date: Fri, 20 Jan 2023 17:15:49 +0800 Subject: [PATCH] feat: suit PowerJobAutoConfiguration for new properties --- .../worker/autoconfigure/PowerJobAutoConfiguration.java | 3 ++- .../powerjob/worker/autoconfigure/PowerJobProperties.java | 5 +++++ .../java/tech/powerjob/worker/container/OmsJarContainer.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java b/powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java index f1e82d99..906345da 100644 --- a/powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java +++ b/powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java @@ -58,6 +58,7 @@ public class PowerJobAutoConfiguration { */ config.setAppName(worker.getAppName()); config.setServerAddress(serverAddress); + config.setProtocol(worker.getProtocol()); /* * For non-Map/MapReduce tasks, {@code memory} is recommended for speeding up calculation. * Map/MapReduce tasks may produce batches of subtasks, which could lead to OutOfMemory @@ -82,7 +83,7 @@ public class PowerJobAutoConfiguration { config.setHealthReportInterval(worker.getHealthReportInterval()); /* - * Create OhMyWorker object and set properties. + * Create PowerJobSpringWorker object and set properties. */ return new PowerJobSpringWorker(config); } diff --git a/powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobProperties.java b/powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobProperties.java index 4074c5ff..cdfe068d 100644 --- a/powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobProperties.java +++ b/powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobProperties.java @@ -1,6 +1,7 @@ package tech.powerjob.worker.autoconfigure; import tech.powerjob.common.RemoteConstant; +import tech.powerjob.common.enums.Protocol; import tech.powerjob.worker.common.constants.StoreStrategy; import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.WorkflowContext; @@ -125,6 +126,10 @@ public class PowerJobProperties { *

*/ private String serverAddress; + /** + * Protocol for communication between WORKER and server + */ + private Protocol protocol = Protocol.AKKA; /** * Local store strategy for H2 database. {@code disk} or {@code memory}. */ diff --git a/powerjob-worker/src/main/java/tech/powerjob/worker/container/OmsJarContainer.java b/powerjob-worker/src/main/java/tech/powerjob/worker/container/OmsJarContainer.java index 2bd27648..8265ac83 100644 --- a/powerjob-worker/src/main/java/tech/powerjob/worker/container/OmsJarContainer.java +++ b/powerjob-worker/src/main/java/tech/powerjob/worker/container/OmsJarContainer.java @@ -38,7 +38,7 @@ public class OmsJarContainer implements OmsContainer { private OhMyClassLoader containerClassLoader; private ClassPathXmlApplicationContext container; - private Map processorCache = Maps.newConcurrentMap(); + private final Map processorCache = Maps.newConcurrentMap(); public OmsJarContainer(Long containerId, String name, String version, File localJarFile) { this.containerId = containerId;