From 04f02b49c5d524345bc916aad6e247c714177662 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 5 Jul 2009 17:38:49 -0700
Subject: Add task logging functionality. When a task runs, it creates a log
 that is stored in the persistant cache for 30 days.  On the admin_maintenance
 page there is a new link for completed tasks "browse log".  Clicking this
 will open a dialog box that has the the contents of the log displayed.

The user can then view the log and close the dialog, or press the save button
to download the log to their local machine.
---
 modules/gallery/helpers/task.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'modules/gallery/helpers/task.php')

diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index a8a004ab..79a7c93b 100644
--- a/modules/gallery/helpers/task.php
+++ b/modules/gallery/helpers/task.php
@@ -56,6 +56,8 @@ class task_Core {
     }
     $task->done = 1;
     $task->state = "cancelled";
+    $task->log(t("Task %task_name cancelled (task id %task_id)",
+                 array("task_name" => $task->name, "task_id" => $task->id)));
     $task->save();
 
     return $task;
-- 
cgit v1.2.3


From f381927ec6bca75e9c588725318f6682bf74d103 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 6 Jul 2009 07:39:36 -0700
Subject: Catch exceptions that are thrown within the task and log them to the
 task log and then set the task to done, the state to error and the status
 message set to the Exception Message.

---
 modules/gallery/helpers/task.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/helpers/task.php')

diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index 79a7c93b..06568887 100644
--- a/modules/gallery/helpers/task.php
+++ b/modules/gallery/helpers/task.php
@@ -76,9 +76,17 @@ class task_Core {
       throw new Exception("@todo MISSING_TASK");
     }
 
-    $task->state = "running";
-    call_user_func_array($task->callback, array(&$task));
-    $task->save();
+    try {
+      $task->state = "running";
+      call_user_func_array($task->callback, array(&$task));
+      $task->save();
+    } catch (Exception $e) {
+      $task->log($e->__toString());
+      $task->state = "error";
+      $task->done = true;
+      $task->status = $e->getMessage();
+      $task->save();
+    }
 
     return $task;
   }
-- 
cgit v1.2.3


From 6dbd36d1ccc482ff542884da0cdc60612436c002 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 6 Jul 2009 10:29:55 -0700
Subject: Always log the task completion status message

---
 modules/gallery/helpers/task.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules/gallery/helpers/task.php')

diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index 06568887..6a9f63c2 100644
--- a/modules/gallery/helpers/task.php
+++ b/modules/gallery/helpers/task.php
@@ -79,6 +79,9 @@ class task_Core {
     try {
       $task->state = "running";
       call_user_func_array($task->callback, array(&$task));
+      if ($task->done) {
+        $task->log($task->status);
+      }
       $task->save();
     } catch (Exception $e) {
       $task->log($e->__toString());
-- 
cgit v1.2.3