Merge pull request #211 from elastic/connection-message-fix

Connection message fix
elastic · Jul 20, 2018 · 63786b9 · 63786b9
2 parents 1e42956 + e8b6707
commit 63786b9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.elasticsearch</groupId>
     <artifactId>support-diagnostics</artifactId>
-    <version>6.4.2</version>
+    <version>6.4.3</version>
     <packaging>jar</packaging>
     <name>Support Diagnostics Utilities</name>
     <properties>

diff --git a/src/main/java/com/elastic/support/diagnostics/Diagnostic.java b/src/main/java/com/elastic/support/diagnostics/Diagnostic.java
@@ -34,6 +34,12 @@ public class Diagnostic {
       try {
          jc.parse(args);
 
+         if (inputs.isHelp()) {
+            jc.usage();
+            proceedToRun = false;
+            return;
+         }
+
          if(! inputs.getDiagType().equalsIgnoreCase(Constants.LOCAL_DIAG)){
             if(StringUtils.isEmpty(inputs.getHost())){
                throw new RuntimeException("Inputs error: You must enter the hostname of a running node within the cluster, preferably on the host you are running the diagnostic from.");
@@ -44,12 +50,6 @@ public class Diagnostic {
             throw new RuntimeException("Inputs error: If authenticating both username and password are required.");
          }
 
-         if (inputs.isHelp()) {
-            jc.usage();
-            proceedToRun = false;
-            return;
-         }
-
          // Set up the output directory
          logger.info("Creating temp directory.");
          createOutputDir(ctx);

diff --git a/src/main/java/com/elastic/support/diagnostics/commands/VersionAndClusterNameCheckCmd.java b/src/main/java/com/elastic/support/diagnostics/commands/VersionAndClusterNameCheckCmd.java
@@ -4,6 +4,7 @@
 import com.elastic.support.diagnostics.chain.DiagnosticContext;
 import com.elastic.support.util.JsonYamlUtils;
 import com.elastic.support.util.RestExec;
+import com.elastic.support.util.SystemProperties;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import java.util.Map;
@@ -28,9 +29,9 @@ public boolean execute(DiagnosticContext context) {
          context.setClusterName(clusterName);
          String versionNumber = root.path("version").path("number").asText();
          context.setVersion(versionNumber);
-
       } catch (Exception e) {
-         logger.info("Error retrieving Elasticsearch version  - unable to continue..  Please make sure the proper connection parameters were specified", e.getMessage());
+         logger.info(e.getMessage());
+         logger.info("Error retrieving Elasticsearch version  - unable to continue..  Please make sure the proper connection parameters were specified.");
          rc = false;
       }
 

diff --git a/src/main/java/com/elastic/support/util/RestExec.java b/src/main/java/com/elastic/support/util/RestExec.java
@@ -57,7 +57,7 @@ public String execBasic(String url) {
          response = exec(url);
          return getResponseString(response);
       } catch (Exception e) {
-         throw new RuntimeException(e);
+         throw new RuntimeException(e.getMessage());
       } finally {
          HttpClientUtils.closeQuietly(response);
       }
@@ -91,10 +91,10 @@ protected HttpResponse exec(String url) {
          }
       } catch (HttpHostConnectException e) {
          logger.log(SystemProperties.DIAG, "Host connection error.", e);
-         throw new RuntimeException("Error connecting to host " + url, e);
+         throw new RuntimeException("Host connection error: " + e.getMessage() );
       } catch (Exception e) {
-         logger.log(SystemProperties.DIAG, "Error executing query.", e);
-         throw new RuntimeException(e);
+         logger.log(SystemProperties.DIAG, "Query Execution Error", e);
+         throw new RuntimeException("Query Execution Error: " + e.getMessage());
       }
 
    }