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

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