[FIXED JENKINS-14584] add more output at evaluation of conditions

jenkinsci · Oct 5, 2013 · 1125b04 · 1125b04
1 parent 9e35ee7
commit 1125b04
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/org/jenkins_ci/plugins/run_condition/core/BooleanCondition.java b/src/main/java/org/jenkins_ci/plugins/run_condition/core/BooleanCondition.java
@@ -54,7 +54,10 @@ public String getToken() {
     @Override
     public boolean runPerform(final AbstractBuild<?, ?> build, final BuildListener listener) throws Exception {
         final String expandedToken = Util.fixEmptyAndTrim(TokenMacro.expandAll(build, listener, token));
-        if (expandedToken == null) return false;
+        listener.getLogger().println(Messages.booleanCondition_check(expandedToken, RUN_REGEX.pattern(), token));
+        if (expandedToken == null) {
+            return false;
+        }
         return RUN_REGEX.matcher(expandedToken.toLowerCase()).matches();
     }
 

diff --git a/src/main/java/org/jenkins_ci/plugins/run_condition/core/CauseCondition.java b/src/main/java/org/jenkins_ci/plugins/run_condition/core/CauseCondition.java
@@ -133,6 +133,8 @@ public boolean isExclusiveCause() {
 
     @Override
     public boolean runPerform(final AbstractBuild<?, ?> build, final BuildListener listener) {
+        final String name = buildCause == null ? "N/A" : buildCause.displayName;
+        listener.getLogger().println(Messages.causeCondition_check(name));
         final List<Cause> causes = build.getCauses();
         if (buildCause != null) {
             if (isExclusiveCause()) {

diff --git a/src/main/java/org/jenkins_ci/plugins/run_condition/core/FileExistsCondition.java b/src/main/java/org/jenkins_ci/plugins/run_condition/core/FileExistsCondition.java
@@ -61,6 +61,7 @@ public String getFile() {
     @Override
     public boolean runPerform(final AbstractBuild<?, ?> build, final BuildListener listener) throws Exception {
         final String expandedFile = TokenMacro.expandAll(build, listener, file);
+        listener.getLogger().println(Messages.fileExistsCondition_check(expandedFile));
         return baseDir.getBaseDirectory(build).child(expandedFile).exists();
     }
 

diff --git a/src/main/java/org/jenkins_ci/plugins/run_condition/core/StatusCondition.java b/src/main/java/org/jenkins_ci/plugins/run_condition/core/StatusCondition.java
@@ -71,6 +71,7 @@ public Result getWorstResult() {
     @Override
     public boolean runPerform(final AbstractBuild<?, ?> build, final BuildListener listener) {
         final Result currentStatus = build.getResult() == null ? Result.SUCCESS : build.getResult();
+        listener.getLogger().println(Messages.statusCondition_check(currentStatus, worstResult, bestResult));
         return worstResult.isWorseOrEqualTo(currentStatus) && bestResult.isBetterOrEqualTo(currentStatus);
     }
 

diff --git a/src/main/resources/org/jenkins_ci/plugins/run_condition/Messages.properties b/src/main/resources/org/jenkins_ci/plugins/run_condition/Messages.properties
@@ -26,17 +26,21 @@ alwaysRun.displayName=Always
 neverRun.displayName=Never
 
 statusCondition.displayName=Current build status
+statusCondition.check=[Current build status] check if current [{0}] is worse or equals then [{1}] and better or equals then [{2}]
 expressionCondition.displayName=Regular expression match
 numericalComparison.displayName=Numerical comparison
 booleanCondition.displayName=Boolean condition
+booleanCondition.check=[Boolean condition] checking [{0}] against [{1}] (origin token: {2})
 fileExistsCondition.displayName=File exists
+fileExistsCondition.check=[File exists] check if file exists [{0}]
 filesMatchCondition.displayName=Files match
 stringsMatchCondition.displayName=Strings match
 timeCondition.displayName=Time
 dayCondition.displayName=Day of week
 causeCondition.displayName=Build Cause
+causeCondition.check=[Build Cause] check if build was triggered by [{0}]
 nodeCondition.displayName=Execution node 
-nodeCondition.check=check if [{0}] is in [{1}]
+nodeCondition.check=[Execution node] check if [{0}] is in [{1}]
 
 logic.and.displayName=And
 logic.or.displayName=Or