Confirm dialog for reset OAuth consumer key and secret button

[quix0rs-gnu-social.git] / scripts / queuedaemon.php

diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php
index bedd14b1a3fbce867534e2c3a0eeb8e4857ce52c..30a8a9602630e439ca16736d829f25bbb10d6ce8 100755 (executable)
--- a/scripts/queuedaemon.php
+++ b/scripts/queuedaemon.php
@@ -109,13 +109,19 @@ class QueueDaemon extends SpawningDaemon
 
         $master = new QueueMaster($this->get_id());
         $master->init($this->all);
-        $master->service();
+        try {
+            $master->service();
+        } catch (Exception $e) {
+            common_log(LOG_ERR, "Unhandled exception: " . $e->getMessage() . ' ' .
+                str_replace("\n", " ", $e->getTraceAsString()));
+            return self::EXIT_ERR;
+        }
 
         $this->log(LOG_INFO, 'finished servicing the queue');
 
         $this->log(LOG_INFO, 'terminating normally');
 
-        return true;
+        return $master->respawn ? self::EXIT_RESTART : self::EXIT_SHUTDOWN;
     }
 }