diff --git a/CHANGELOG.md b/CHANGELOG.md index f2f420c..3038065 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Generic Webhook Plugin Changelog Changelog of Generic Webhook Plugin. +## Unreleased +### No issue + +**doc** + + +[b0fad3a4ff5f110](https://github.com/jenkinsci/generic-webhook-trigger-plugin/commit/b0fad3a4ff5f110) Tomas Bjerre *2017-07-26 04:15:15* + + ## 1.16 (2017-07-25 18:10:46) ### GitHub [#13](https://github.com/jenkinsci/generic-webhook-trigger-plugin/issues/13) Generic Webhook hook stops working on v1.15 *bug* diff --git a/src/main/java/org/jenkinsci/plugins/gwt/GenericWebHookRequestReceiver.java b/src/main/java/org/jenkinsci/plugins/gwt/GenericWebHookRequestReceiver.java index 534ae7a..fc53ff9 100644 --- a/src/main/java/org/jenkinsci/plugins/gwt/GenericWebHookRequestReceiver.java +++ b/src/main/java/org/jenkinsci/plugins/gwt/GenericWebHookRequestReceiver.java @@ -31,6 +31,11 @@ @Extension public class GenericWebHookRequestReceiver extends CrumbExclusion implements UnprotectedRootAction { + private static final String NO_JOBS_MSG = + "Did not find any jobs to trigger! " + + "The user invoking /generic-webhook-trigger/invoke must have read permission to any jobs that should be triggered. " + + "You may try adding http://user:passw@url... " + + "or configuring and passing an authentication token like ...trigger/invoke?token=TOKENHERE"; private static final String URL_NAME = "generic-webhook-trigger"; private static final Logger LOGGER = Logger.getLogger(GenericWebHookRequestReceiver.class.getName()); @@ -70,15 +75,11 @@ HttpResponse doInvoke( String token) { List foundJobs = JobFinder.findAllJobsWithTrigger(token); + Map triggerResults = new HashMap<>(); if (foundJobs.isEmpty()) { - LOGGER.log( - INFO, - "Did not find any jobs to trigger! " - + "The user invoking /generic-webhook-trigger/invoke must have read permission to any jobs that should be triggered. " - + "You may try adding http://user:passw@url... " - + "or configuring and passing an authentication token like ...trigger/invoke?token=TOKENHERE"); + LOGGER.log(INFO, NO_JOBS_MSG); + triggerResults.put("ANY", NO_JOBS_MSG); } - Map triggerResults = new HashMap<>(); for (FoundJob foundJob : foundJobs) { try { LOGGER.log(INFO, "Triggering " + foundJob.getFullName());