only send "Back to normal" if "Notify Back To Normal" is enabled

send a "Success" even if the previous build failed, if only "Notify Success" is enabled but "Notify Back To Normal" is disabled.
jenkinsci · Mar 14, 2016 · db4738c · db4738c
1 parent 5149c5a
commit db4738c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/jenkins/plugins/slack/ActiveNotifier.java b/src/main/java/jenkins/plugins/slack/ActiveNotifier.java
@@ -242,7 +242,7 @@ public MessageBuilder appendStatusMessage() {
             return this;
         }
 
-        static String getStatusMessage(AbstractBuild r) {
+        private String getStatusMessage(AbstractBuild r) {
             if (r.isBuilding()) {
                 return STARTING_STATUS_MESSAGE;
             }
@@ -279,7 +279,7 @@ static String getStatusMessage(AbstractBuild r) {
              */
             if (result == Result.SUCCESS
                     && (previousResult == Result.FAILURE || previousResult == Result.UNSTABLE) 
-                    && buildHasSucceededBefore) {
+                    && buildHasSucceededBefore && notifier.getNotifyBackToNormal()) {
                 return BACK_TO_NORMAL_STATUS_MESSAGE;
             }
             if (result == Result.FAILURE && previousResult == Result.FAILURE) {