Merge branch 'bugfix' into development

rundeck · Jan 12, 2011 · 7894df8 · 7894df8
2 parents ec43c9f + 661002c
commit 7894df8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/core/src/java/com/dtolabs/rundeck/core/cli/DefaultNodeDispatcher.java b/core/src/java/com/dtolabs/rundeck/core/cli/DefaultNodeDispatcher.java
@@ -162,10 +162,16 @@ public void reportSuccess(final String nodename) {
                     if (keepgoing) {
                         project.log("Failed execution for node: " + node.getNodename() + ": " + e.getMessage(),
                             Project.MSG_ERR);
-                    } else if (e instanceof BuildException) {
-                        throw (BuildException) e;
-                    } else {
-                        throw new CoreException("Error dispatching execution", e);
+                    } else{
+                        if (nodeNames.size() > 0 && null != failedListener) {
+                            //tell listener of failed node list
+                            failedListener.nodesFailed(nodeNames);
+                        }
+                        if (e instanceof BuildException) {
+                            throw (BuildException) e;
+                        } else {
+                            throw new CoreException("Error dispatching execution", e);
+                        }
                     }
                 }
             }

diff --git a/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy b/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy
@@ -1275,6 +1275,8 @@ class ScheduledExecutionController  {
         if(params['_sessionwf']=='true' && session.editWF && session.editWF['_new']){
             //use session-stored workflow
             def Workflow wf = session.editWF['_new']
+            wf.keepgoing=params.workflow.keepgoing=='true'
+            wf.strategy=params.workflow.strategy
             if(!wf.commands || wf.commands.size()<1){
                 failed=true
                 scheduledExecution.errors.rejectValue('workflow','scheduledExecution.workflow.empty.message')