Merge branch '0.8.x' into testing

2009-08-26 10:27:53 -04:00
parent e3a53251c0 fd53fba114
commit c5cf2c4c94
2 changed files with 20 additions and 5 deletions
--- a/lib/queuehandler.php
+++ b/lib/queuehandler.php
@@ -75,6 +75,7 @@ class QueueHandler extends Daemon
    function run()
    {
        if (!$this->start()) {
+            $this->log(LOG_WARNING, 'failed to start');
            return false;
        }

@@ -87,9 +88,15 @@ class QueueHandler extends Daemon

        $qm->service($queue, $this);

+        $this->log(LOG_INFO, 'finished servicing the queue');
+
        if (!$this->finish()) {
+            $this->log(LOG_WARNING, 'failed to clean up');
            return false;
        }
+
+        $this->log(LOG_INFO, 'terminating normally');
+
        return true;
    }