Merge PR jenkinsci#81 Improvements to test connection

chEbba · Apr 11, 2015 · 58e2f4c · 58e2f4c
2 parents 7d55122 + 7323ecf
commit 58e2f4c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/main/java/jenkins/plugins/slack/SlackNotifier.java b/src/main/java/jenkins/plugins/slack/SlackNotifier.java
@@ -186,8 +186,8 @@ public FormValidation doTestConnection(@QueryParameter("slackTeamDomain") final
             try {
                 SlackService testSlackService = new StandardSlackService(teamDomain, authToken, room);
                 String message = "Slack/Jenkins plugin: you're all set on " + buildServerUrl;
-                testSlackService.publish(message, "green");
-                return FormValidation.ok("Success");
+                boolean success = testSlackService.publish(message, "green");
+                return success ? FormValidation.ok("Success") : FormValidation.error("Failure");
             } catch (Exception e) {
                 return FormValidation.error("Client error : " + e.getMessage());
             }
@@ -355,8 +355,8 @@ public FormValidation doTestConnection(@QueryParameter("slackTeamDomain") final
                 try {
                     SlackService testSlackService = new StandardSlackService(teamDomain, authToken, room);
                     String message = "Slack/Jenkins plugin: you're all set.";
-                    testSlackService.publish(message, "green");
-                    return FormValidation.ok("Success");
+                    boolean success = testSlackService.publish(message, "green");
+                    return success ? FormValidation.ok("Success") : FormValidation.error("Failure");
                 } catch (Exception e) {
                     return FormValidation.error("Client error : " + e.getMessage());
                 }

diff --git a/src/main/java/jenkins/plugins/slack/SlackService.java b/src/main/java/jenkins/plugins/slack/SlackService.java
@@ -1,7 +1,7 @@
 package jenkins.plugins.slack;
 
 public interface SlackService {
-    void publish(String message);
+    boolean publish(String message);
 
-    void publish(String message, String color);
+    boolean publish(String message, String color);
 }
diff --git a/src/main/java/jenkins/plugins/slack/StandardSlackService.java b/src/main/java/jenkins/plugins/slack/StandardSlackService.java
@@ -31,11 +31,11 @@ public StandardSlackService(String teamDomain, String token, String roomId) {
         this.roomIds = roomId.split("[,; ]+");
     }
 
-    public void publish(String message) {
-        publish(message, "warning");
+    public boolean publish(String message) {
+        return publish(message, "warning");
     }
 
-    public void publish(String message, String color) {
+    public boolean publish(String message, String color) {
         for (String roomId : roomIds) {
             String url = "https://" + teamDomain + "." + host + "/services/hooks/jenkins-ci?token=" + token;
             logger.info("Posting: to " + roomId + " on " + teamDomain + " using " + url +": " + message + " " + color);
@@ -67,14 +67,18 @@ public void publish(String message, String color) {
                 String response = post.getResponseBodyAsString();
                 if(responseCode != HttpStatus.SC_OK) {
                     logger.log(Level.WARNING, "Slack post may have failed. Response: " + response);
+                    return false;
                 }
+                return true;
             } catch (Exception e) {
                 logger.log(Level.WARNING, "Error posting to Slack", e);
+                return false;
             } finally {
                 logger.info("Posting succeeded");
                 post.releaseConnection();
             }
         }
+        return false;
     }
 
     private HttpClient getHttpClient() {