From e939507a5bf6a3c2c1d589cbe4cb34ec5c3df23e Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude@laposte.net>
Date: Wed, 25 Apr 2018 00:32:22 +0200
Subject: [PATCH] Cleanup configuration of Akka
---
docker/config/application.tmpl | 6 ------
.../hbp/mip/akka/AkkaClusterHealthCheck.java | 4 ----
.../hbp/mip/akka/WokenClientController.java | 3 ---
.../mip/configuration/AkkaConfiguration.java | 19 ++++++-------------
4 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/docker/config/application.tmpl b/docker/config/application.tmpl
index 65f3335d9..9a56dad4c 100644
--- a/docker/config/application.tmpl
+++ b/docker/config/application.tmpl
@@ -84,9 +84,3 @@ endpoints:
services:
exareme:
miningExaremeUrl: {{ default .Env.EXAREME_URL "http://localhost:9090" }}/mining/query
-
-akka:
- woken:
- host: {{ default .Env.WOKEN_PORT_8088_TCP_ADDR "woken" }}
- port: {{ default .Env.WOKEN_PORT_8088_TCP_PORT "8088" }}
- path: {{ default .Env.WOKEN_AKKA_PATH "/user/entrypoint" }}
diff --git a/src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java b/src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java
index 42557da8c..932599223 100644
--- a/src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java
+++ b/src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java
@@ -1,6 +1,5 @@
package eu.hbp.mip.akka;
-import akka.actor.ActorRef;
import akka.cluster.Cluster;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.health.Health;
@@ -11,9 +10,6 @@ import org.springframework.stereotype.Component;
@Component
public class AkkaClusterHealthCheck implements HealthIndicator {
- @Autowired
- private ActorRef wokenMediator;
-
@Autowired
private Cluster wokenCluster;
diff --git a/src/main/java/eu/hbp/mip/akka/WokenClientController.java b/src/main/java/eu/hbp/mip/akka/WokenClientController.java
index 6c12dc403..5e34b75b3 100644
--- a/src/main/java/eu/hbp/mip/akka/WokenClientController.java
+++ b/src/main/java/eu/hbp/mip/akka/WokenClientController.java
@@ -30,9 +30,6 @@ public abstract class WokenClientController {
@Autowired
private ActorSystem actorSystem;
- @Autowired
- private String wokenReceptionistPath;
-
@Value("#{'${akka.woken.path:/user/entrypoint}'}")
private String wokenPath;
diff --git a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
index 0acbaa0d1..32716277a 100644
--- a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
@@ -10,12 +10,13 @@ import com.typesafe.config.ConfigFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import java.util.List;
+
import static eu.hbp.mip.akka.SpringExtension.SPRING_EXTENSION_PROVIDER;
/**
@@ -31,18 +32,10 @@ class AkkaConfiguration {
@Autowired
private ApplicationContext applicationContext;
- @Value("#{'${akka.woken.host:woken}'}")
- private String wokenHost;
-
- @Value("#{'${akka.woken.port:8088}'}")
- private String wokenPort;
-
- @Value("#{'${akka.woken.path:/user/entrypoint}'}")
- private String wokenPath;
+ private final Config config = ConfigFactory.load("application.conf");
@Bean
public ExtendedActorSystem actorSystem() {
- Config config = ConfigFactory.load("application.conf");
ExtendedActorSystem system = (ExtendedActorSystem) ActorSystem.create("woken", config);
SPRING_EXTENSION_PROVIDER.get(system).initialize(applicationContext);
return system;
@@ -54,13 +47,13 @@ class AkkaConfiguration {
}
@Bean
- public String wokenReceptionistPath() {
- return "akka.tcp://woken@" + wokenHost + ":" + wokenPort + "/system/receptionist";
+ public List<String> wokenPath() {
+ return config.getStringList("akka.cluster.seed-nodes");
}
@Bean
public ActorRef wokenMediator() {
- LOGGER.info("Start Woken client " + wokenReceptionistPath());
+ LOGGER.info("Connect to Woken cluster at " + String.join(",", wokenPath()));
return DistributedPubSub.get(actorSystem()).mediator();
}
--
GitLab