Set the default ClusterHost in VertxOptions from the SystemContext.

codingchili · Mar 29, 2018 · f09c4fb · f09c4fb
1 parent 399b2a9
commit f09c4fb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'maven'
 
-project.version = "1.0.26-SNAPSHOT"
+project.version = "1.0.28-SNAPSHOT"
 project.group = 'com.github.codingchili.chili-core'
 
 subprojects {

diff --git a/core/main/java/com/codingchili/core/configuration/Environment.java b/core/main/java/com/codingchili/core/configuration/Environment.java
@@ -1,13 +1,9 @@
 package com.codingchili.core.configuration;
 
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Optional;
+import java.net.*;
+import java.util.*;
+
+import com.codingchili.core.context.CoreRuntimeException;
 
 /**
  * @author Robin Duda
@@ -27,6 +23,19 @@ public static Optional<String> hostname() {
         }
     }
 
+    /**
+     * @return an IP address of this host. Which address that is returned is
+     * not deterministic in case of multiple network interfaces. It should however
+     * not return the loopback address.
+     */
+    public static String address() {
+        try {
+            return InetAddress.getLocalHost().getHostAddress();
+        } catch (UnknownHostException e) {
+            throw new CoreRuntimeException(e.getMessage());
+        }
+    }
+
     /**
      * @return a list of all addresses available on all network interfaces.
      */

diff --git a/core/main/java/com/codingchili/core/configuration/system/SystemSettings.java b/core/main/java/com/codingchili/core/configuration/system/SystemSettings.java
@@ -5,6 +5,7 @@
 import io.vertx.core.metrics.MetricsOptions;
 
 import com.codingchili.core.configuration.Configurable;
+import com.codingchili.core.configuration.Environment;
 
 import static com.codingchili.core.configuration.CoreStrings.PATH_SYSTEM;
 
@@ -146,7 +147,9 @@ public VertxOptions getOptions() {
         // mode it will set clustered = true, if creating a new instance without clustering
         // an exception will be thrown. This causes most test cases to fail.
         if (options == null) {
-            return new VertxOptions().setMetricsOptions(new MetricsOptions().setEnabled(isMetrics()));
+            return new VertxOptions()
+                    .setMetricsOptions(new MetricsOptions().setEnabled(isMetrics()))
+                    .setClusterHost(Environment.address());
         } else {
             return options;
         }