Changes in src/Actions/ActionQueue.cpp [601ef8:f3db60]

File:

• src/Actions/ActionQueue.cpp (modified) (4 diffs)

src/Actions/ActionQueue.cpp

@@ -63 +63 @@
     history(new ActionHistory),
 #ifndef HAVE_ACTION_THREAD
-    lastActionOk(true)
+    lastActionOk(true),
 #else
     CurrentAction(0),
     lastActionOk(true),
     run_thread(boost::bind(&ActionQueue::run, this)),
-    run_thread_isIdle(true)
-#endif
+    run_thread_isIdle(true),
+#endif
+    dryrun_flag(false)
 {
   // channels of observable
@@ -109 +110 @@
 #ifndef HAVE_ACTION_THREAD
   try {
-    newaction->call();
+    if (!isDryRun(newaction))
+      newaction->call();
     lastActionOk = true;
   } catch(ActionFailureException &e) {
@@ -175 +177 @@
       LOG(0, "Calling Action " << actionqueue[CurrentAction]->getName() << " ... ");
       try {
-        actionqueue[CurrentAction]->call();
+        if (!isDryRun(actionqueue[CurrentAction]))
+          actionqueue[CurrentAction]->call();
         pushStatus("SUCCESS: Action "+actionqueue[CurrentAction]->getName()+" successful.");
         lastActionOk = true;
@@ -380 +383 @@
 }
 
+bool ActionQueue::isDryRun(const Action *_nextaction) const
+{
+  bool status = dryrun_flag;
+  status &= (_nextaction->getName() != "no-dry-run");
+  return status;
+}
 
 CONSTRUCT_SINGLETON(ActionQueue)