From 0069e8ca86f5430fb55771dfdec925d22b651232 Mon Sep 17 00:00:00 2001 From: Ludovic Claude <ludovic.claude@laposte.net> Date: Tue, 24 Apr 2018 21:53:09 +0200 Subject: [PATCH] Rename to wokenCluster, conflict in Spring bean names --- src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java | 6 +++--- .../java/eu/hbp/mip/configuration/AkkaConfiguration.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java b/src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java index af32ff950..42557da8c 100644 --- a/src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java +++ b/src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java @@ -15,13 +15,13 @@ public class AkkaClusterHealthCheck implements HealthIndicator { private ActorRef wokenMediator; @Autowired - private Cluster cluster; + private Cluster wokenCluster; @Override public Health health() { - if (cluster.state().getLeader() == null) { + if (wokenCluster.state().getLeader() == null) { return Health.down().withDetail("Error", "No leader in the cluster").build(); - } else if (!cluster.state().allRoles().contains("woken")) { + } else if (!wokenCluster.state().allRoles().contains("woken")) { return Health.down().withDetail("Error", "Woken server cannot be seen in the cluster").build(); } return Health.up().build(); diff --git a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java index 6351d4711..4163f8c75 100644 --- a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java +++ b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java @@ -49,7 +49,7 @@ class AkkaConfiguration { } @Bean - public Cluster cluster() { + public Cluster wokenCluster() { return new Cluster(actorSystem()); } -- GitLab