From 8305ae8abd5d1de993cb3a77ee7cfd764ef4f6d7 Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Wed, 10 Apr 2019 17:03:27 +0200
Subject: [PATCH] Use common configuration
---
.../hbp/mip/configuration/AkkaConfiguration.java | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
index 6e679f671..06c0e7967 100644
--- a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
@@ -6,6 +6,7 @@ import akka.actor.ExtendedActorSystem;
import akka.cluster.Cluster;
import akka.cluster.Member;
import akka.cluster.pubsub.DistributedPubSub;
+import ch.chuv.lren.woken.utils.ConfigurationLoader;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import org.apache.commons.lang3.StringUtils;
@@ -37,18 +38,9 @@ public class AkkaConfiguration {
private final Config config;
{
- Config remotingConfig = ConfigFactory.parseResourcesAnySyntax("akka-remoting.conf").resolve();
- String remotingImpl = remotingConfig.getString("remoting.implementation");
- config = ConfigFactory
- .parseString("akka {\n" +
- " actor.provider = cluster\n" +
- " extensions += \"akka.cluster.pubsub.DistributedPubSub\"\n" +
- "}")
- .withFallback(ConfigFactory.parseResourcesAnySyntax("akka.conf"))
- .withFallback(ConfigFactory.parseResourcesAnySyntax("akka-" + remotingImpl + "-remoting.conf"))
- .withFallback(ConfigFactory.parseResourcesAnySyntax("kamon.conf"))
- .withFallback(ConfigFactory.load())
- .resolve();
+ Config appConfig = ConfigFactory.parseResourcesAnySyntax("akka.conf")
+ .withFallback(ConfigFactory.parseResourcesAnySyntax("kamon.conf"));
+ config = ConfigurationLoader.appendClusterConfiguration(appConfig).resolve();
}
@Bean
--
GitLab