From f56cef49680df0eb5b234f0e4e4e23a3dcd12733 Mon Sep 17 00:00:00 2001 From: kenji21 Date: Thu, 16 Nov 2017 09:09:54 +0100 Subject: [PATCH] Send only one message with commit list. --- .../jenkins/plugins/slack/ActiveNotifier.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/jenkins/plugins/slack/ActiveNotifier.java b/src/main/java/jenkins/plugins/slack/ActiveNotifier.java index 0d717d3b..b13f9709 100755 --- a/src/main/java/jenkins/plugins/slack/ActiveNotifier.java +++ b/src/main/java/jenkins/plugins/slack/ActiveNotifier.java @@ -110,11 +110,12 @@ public void finalized(AbstractBuild r) { } while (previousBuild != null && previousBuild.getResult() == Result.ABORTED); Result previousResult = (previousBuild != null) ? previousBuild.getResult() : Result.SUCCESS; if(null != previousResult && (result.isWorseThan(previousResult) || moreTestFailuresThanPreviousBuild(r, previousBuild)) && notifier.getNotifyRegression()) { - getSlack(r).publish(getBuildStatusMessage(r, notifier.getIncludeTestSummary(), - notifier.getIncludeFailedTests(), notifier.getIncludeCustomMessage()), getBuildColor(r)); + String message = getBuildStatusMessage(r, notifier.getIncludeTestSummary(), + notifier.getIncludeFailedTests(), notifier.getIncludeCustomMessage()); if (notifier.getCommitInfoChoice().showAnything()) { - getSlack(r).publish(getCommitList(r), getBuildColor(r)); - } + message = message + "\n" + getCommitList(r); + } + getSlack(r).publish(message, getBuildColor(r)); } } } @@ -141,11 +142,12 @@ public void completed(AbstractBuild r) { && notifier.getNotifyBackToNormal()) || (result == Result.SUCCESS && notifier.getNotifySuccess()) || (result == Result.UNSTABLE && notifier.getNotifyUnstable())) { - getSlack(r).publish(getBuildStatusMessage(r, notifier.getIncludeTestSummary(), - notifier.getIncludeFailedTests(), notifier.getIncludeCustomMessage()), getBuildColor(r)); + String message = getBuildStatusMessage(r, notifier.getIncludeTestSummary(), + notifier.getIncludeFailedTests(), notifier.getIncludeCustomMessage()); if (notifier.getCommitInfoChoice().showAnything()) { - getSlack(r).publish(getCommitList(r), getBuildColor(r)); + message = message + "\n" + getCommitList(r); } + getSlack(r).publish(message, getBuildColor(r)); } } }