Better hostname setting from server options if no network is present

hugovk · Oct 15, 2019 · 025c61d · 025c61d
1 parent b835acc
commit 025c61d
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/java/server/src/org/openqa/selenium/grid/server/BaseServerOptions.java b/java/server/src/org/openqa/selenium/grid/server/BaseServerOptions.java
@@ -17,17 +17,21 @@
 
 package org.openqa.selenium.grid.server;
 
+import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.grid.config.ConfigException;
+import org.openqa.selenium.net.HostIdentifier;
 import org.openqa.selenium.net.NetworkUtils;
 import org.openqa.selenium.net.PortProber;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Optional;
+import java.util.logging.Logger;
 
 public class BaseServerOptions {
 
+  private static final Logger LOG = Logger.getLogger(BaseServerOptions.class.getName());
   private final Config config;
   private int port = -1;
 
@@ -70,7 +74,15 @@ public int getMaxServerThreads() {
   public URI getExternalUri() {
     // Assume the host given is addressable if it's been set
     String host = getHostname()
-        .orElseGet(() -> new NetworkUtils().getNonLoopbackAddressOfThisMachine());
+        .orElseGet(() -> {
+          try {
+            return new NetworkUtils().getNonLoopbackAddressOfThisMachine();
+          } catch (WebDriverException e) {
+            String name = HostIdentifier.getHostName();
+            LOG.info("No network connection, guessing name: " + name);
+            return name;
+          }
+        });
 
     int port = getPort();