Refs #7181, add logging to ArchivePurger service + archive purging scheduled tasks + Scheduler, modify CronArchive to run scheduled tasks within same process as core:archive so logs are visible in core:archive output.

2 files changed, 19 insertions, 5 deletions

diff --git a/core/Scheduler/Scheduler.php b/core/Scheduler/Scheduler.php
index 7156e1be9c..f4e2097ca5 100644
--- a/core/Scheduler/Scheduler.php
+++ b/core/Scheduler/Scheduler.php
@@ -99,9 +99,9 @@ class Scheduler
 
         // for every priority level, starting with the highest and concluding with the lowest
         $executionResults = array();
-        for ($priority = Task::HIGHEST_PRIORITY;
-             $priority <= Task::LOWEST_PRIORITY;
-             ++$priority) {
+        for ($priority = Task::HIGHEST_PRIORITY; $priority <= Task::LOWEST_PRIORITY; ++$priority) {
+            $this->logger->debug("Executing tasks with priority {priority}:", array('priority' => $priority));
+
             // loop through each task
             foreach ($tasks as $task) {
                 // if the task does not have the current priority level, don't execute it yet
@@ -113,14 +113,24 @@ class Scheduler
                 $shouldExecuteTask = $this->timetable->shouldExecuteTask($taskName);
 
                 if ($this->timetable->taskShouldBeRescheduled($taskName)) {
-                    $this->timetable->rescheduleTask($task);
+                    $rescheduledDate = $this->timetable->rescheduleTask($task);
+
+                    $this->logger->debug("Task {task} is scheduled to run again for {date}.", array('task' => $taskName, 'date' => $rescheduledDate));
                 }
 
                 if ($shouldExecuteTask) {
+                    $this->logger->info("Scheduler: executing task {taskName}...", array('taskName' => $taskName));
+
+                    $timer = new Timer();
+
                     $this->isRunningTask = true;
                     $message = $this->executeTask($task);
                     $this->isRunningTask = false;
 
+                    $this->logger->info("Scheduler: finished executing task {taskName}. {timeElapsed}", array(
+                        'taskName' => $taskName, 'timeElapsed' => $timer
+                    ));
+
                     $executionResults[] = array('task' => $taskName, 'output' => $message);
                 }
             }
diff --git a/core/Scheduler/Timetable.php b/core/Scheduler/Timetable.php
index 5c9bc69696..c3c01ab167 100644
--- a/core/Scheduler/Timetable.php
+++ b/core/Scheduler/Timetable.php
@@ -105,9 +105,13 @@ class Timetable
 
     public function rescheduleTask(Task $task)
     {
+        $rescheduledTime = $task->getRescheduledTime();
+
         // update the scheduled time
-        $this->timetable[$task->getName()] = $task->getRescheduledTime();
+        $this->timetable[$task->getName()] = $rescheduledTime;
         $this->save();
+
+        return Date::factory($rescheduledTime);
     }
 
     public function save()