From 62ff0fa18c0124126df94e77a0d32559c766394b Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Thu, 11 Apr 2019 23:32:46 +0200
Subject: [PATCH] Improve init of actor system
---
.../java/eu/hbp/mip/akka/WokenClientController.java | 13 ++++++++-----
.../eu/hbp/mip/configuration/AkkaConfiguration.java | 8 +-------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/main/java/eu/hbp/mip/akka/WokenClientController.java b/src/main/java/eu/hbp/mip/akka/WokenClientController.java
index 5e34b75b3..a8bab66fa 100644
--- a/src/main/java/eu/hbp/mip/akka/WokenClientController.java
+++ b/src/main/java/eu/hbp/mip/akka/WokenClientController.java
@@ -2,6 +2,7 @@ package eu.hbp.mip.akka;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
+import akka.cluster.pubsub.DistributedPubSub;
import akka.cluster.pubsub.DistributedPubSubMediator;
import akka.pattern.Patterns;
import akka.util.Timeout;
@@ -10,6 +11,7 @@ import ch.chuv.lren.woken.messages.query.QueryResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -33,9 +35,6 @@ public abstract class WokenClientController {
@Value("#{'${akka.woken.path:/user/entrypoint}'}")
private String wokenPath;
- @Autowired
- private ActorRef wokenMediator;
-
@SuppressWarnings("unchecked")
protected <A, B> B askWoken(A message, int waitInSeconds) throws Exception {
LOGGER.info("Akka is trying to reach remote " + wokenPath);
@@ -43,7 +42,7 @@ public abstract class WokenClientController {
DistributedPubSubMediator.Send queryMessage = new DistributedPubSubMediator.Send(wokenPath, message, false);
Timeout timeout = new Timeout(Duration.create(waitInSeconds, "seconds"));
- Future<Object> future = Patterns.ask(wokenMediator, queryMessage, timeout);
+ Future<Object> future = Patterns.ask(wokenMediator(), queryMessage, timeout);
return (B) Await.result(future, timeout.duration());
}
@@ -75,10 +74,14 @@ public abstract class WokenClientController {
DistributedPubSubMediator.Send queryMessage = new DistributedPubSubMediator.Send(wokenPath, query, false);
- return Patterns.ask(wokenMediator, queryMessage, waitInSeconds);
+ return Patterns.ask(wokenMediator(), queryMessage, waitInSeconds);
}
protected ExecutionContext getExecutor() {
return actorSystem.dispatcher();
}
+
+ private ActorRef wokenMediator() {
+ return DistributedPubSub.get(actorSystem).mediator();
+ }
}
diff --git a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
index 06c0e7967..081d55b37 100644
--- a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
@@ -53,6 +53,7 @@ public class AkkaConfiguration {
}
@Bean
+ @DependsOn("actorSystem")
public Cluster wokenCluster() {
Cluster cluster = Cluster.get(actorSystem());
LOGGER.info("Connect to Woken cluster nodes at " + String.join(",", wokenPath()));
@@ -120,11 +121,4 @@ public class AkkaConfiguration {
return config.getStringList("akka.cluster.seed-nodes");
}
- @Bean
- @Lazy
- @DependsOn("wokenCluster")
- public ActorRef wokenMediator() {
- return DistributedPubSub.get(actorSystem()).mediator();
- }
-
}
--
GitLab