GG-21710 Added processing of additional connection errors. (apache#316)

gridgain · Jul 31, 2019 · badca30 · badca30
1 parent dcc74e9
commit badca30
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/...es/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java b/...es/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java
@@ -16,6 +16,7 @@
 
 package org.apache.ignite.console.agent;
 
+import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
 import java.net.Authenticator;
@@ -152,12 +153,26 @@ public class AgentLauncher {
                 return;
             }
 
+            if (X.hasCause(e, EOFException.class)) {
+                log.error("Failed to receive response from server (connection lost).");
+
+                return;
+            }
+
             IOException ignore = X.cause(e, IOException.class);
 
-            if (ignore != null && "404".equals(ignore.getMessage())) {
-                log.error("Failed to receive response from server (connection refused).");
+            if (ignore != null) {
+                if ("404".equals(ignore.getMessage())) {
+                    log.error("Failed to receive response from server (connection refused).");
 
-                return;
+                    return;
+                }
+
+                if ("504".equals(ignore.getMessage())) {
+                    log.error("Failed to receive response from server (connection timeout).");
+
+                    return;
+                }
             }
 
             log.error("Connection error.", e);
@@ -172,10 +187,13 @@ public class AgentLauncher {
 
         IOException ioCause = X.cause(e, IOException.class);
 
-        if (ioCause != null && "404".equals(ioCause.getMessage())) {
-            log.error("You are using outdated version of Web agent. Please download latest version of Web agent from Web console");
+        if (ioCause != null) {
+            if ("404".equals(ioCause.getMessage())) {
+                log.error("You have configured invalid server-uri property or are using outdated version of Web agent.");
+                log.error("Please check you configuration file or download latest version of Web agent from Web console.");
 
-            System.exit(1);
+                System.exit(1);
+            }
         }
 
         onError.call(args);