From 31d2283f99684335d08d21c093f05c958f160f91 Mon Sep 17 00:00:00 2001 From: tjq Date: Sat, 31 Dec 2022 16:40:33 +0800 Subject: [PATCH] feat: add remote akka impl --- .../java/tech/powerjob/remote/akka/AkkaCSInitializer.java | 2 +- .../main/java/tech/powerjob/remote/akka/AkkaConstant.java | 6 +++--- .../java/tech/powerjob/remote/akka/AkkaTransporter.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/powerjob-remote/powerjob-remote-impl-akka/src/main/java/tech/powerjob/remote/akka/AkkaCSInitializer.java b/powerjob-remote/powerjob-remote-impl-akka/src/main/java/tech/powerjob/remote/akka/AkkaCSInitializer.java index ae6e201c..bbfe61b1 100644 --- a/powerjob-remote/powerjob-remote-impl-akka/src/main/java/tech/powerjob/remote/akka/AkkaCSInitializer.java +++ b/powerjob-remote/powerjob-remote-impl-akka/src/main/java/tech/powerjob/remote/akka/AkkaCSInitializer.java @@ -50,7 +50,7 @@ public class AkkaCSInitializer implements CSInitializer { Config akkaFinalConfig = ConfigFactory.parseMap(overrideConfig).withFallback(akkaBasicConfig); // 启动时绑定当前的 actorSystemName - String actorSystemName = AkkaConstant.fetchActorSystemName(config.getServerType(), false); + String actorSystemName = AkkaConstant.fetchActorSystemName(config.getServerType(), true); this.actorSystem = ActorSystem.create(actorSystemName, akkaFinalConfig); // 处理系统中产生的异常情况 diff --git a/powerjob-remote/powerjob-remote-impl-akka/src/main/java/tech/powerjob/remote/akka/AkkaConstant.java b/powerjob-remote/powerjob-remote-impl-akka/src/main/java/tech/powerjob/remote/akka/AkkaConstant.java index 425f6981..b40d4b8c 100644 --- a/powerjob-remote/powerjob-remote-impl-akka/src/main/java/tech/powerjob/remote/akka/AkkaConstant.java +++ b/powerjob-remote/powerjob-remote-impl-akka/src/main/java/tech/powerjob/remote/akka/AkkaConstant.java @@ -20,13 +20,13 @@ public class AkkaConstant { /** * 获取 actorSystem 名称 * @param serverType 当前服务器类型,powerjob-server 为 server,powerjob-worker 为 worker - * @param reversed 是否反向输出,默认输出当前服务器对应的 actorSystemName,reversed = true 后倒置为目标服务器的 actorSystemName + * @param mine 是否输出当前服务器对应的 actorSystemName,mine = false 后倒置为目标服务器的 actorSystemName * @return actorSystemName */ - public static String fetchActorSystemName(ServerType serverType, boolean reversed) { + public static String fetchActorSystemName(ServerType serverType, boolean mine) { boolean outputServer = serverType == ServerType.SERVER; - if (reversed) { + if (!mine) { outputServer = !outputServer; } diff --git a/powerjob-remote/powerjob-remote-impl-akka/src/main/java/tech/powerjob/remote/akka/AkkaTransporter.java b/powerjob-remote/powerjob-remote-impl-akka/src/main/java/tech/powerjob/remote/akka/AkkaTransporter.java index b03358f8..bac619ca 100644 --- a/powerjob-remote/powerjob-remote-impl-akka/src/main/java/tech/powerjob/remote/akka/AkkaTransporter.java +++ b/powerjob-remote/powerjob-remote-impl-akka/src/main/java/tech/powerjob/remote/akka/AkkaTransporter.java @@ -48,7 +48,7 @@ public class AkkaTransporter implements Transporter { public AkkaTransporter(ServerType serverType, ActorSystem actorSystem) { this.actorSystem = actorSystem; this.serverType = serverType; - this.targetActorSystemName = AkkaConstant.fetchActorSystemName(serverType, true); + this.targetActorSystemName = AkkaConstant.fetchActorSystemName(serverType, false); } @Override