refs #4903 before executing a scheduled task reschedule it to prevent…

… multiple executions when multiple archiver are running
matomo-org · Apr 2, 2014 · 934caa2 · 934caa2
1 parent 2f7d4c5
commit 934caa2
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/core/TaskScheduler.php b/core/TaskScheduler.php
@@ -126,17 +126,19 @@ private function doRunTasks()
                 }
 
                 $taskName = $task->getName();
-                if ($this->timetable->shouldExecuteTask($taskName)) {
+                $shouldExecuteTask = $this->timetable->shouldExecuteTask($taskName);
+
+                if ($this->timetable->taskShouldBeRescheduled($taskName)) {
+                    $this->timetable->rescheduleTask($task);
+                }
+
+                if ($shouldExecuteTask) {
                     $this->isRunning = true;
                     $message = self::executeTask($task);
                     $this->isRunning = false;
 
                     $executionResults[] = array('task' => $taskName, 'output' => $message);
                 }
-
-                if ($this->timetable->taskShouldBeRescheduled($taskName)) {
-                    $this->timetable->rescheduleTask($task);
-                }
             }
         }