Merge branch 'master' into 'master'

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

diff --git a/scripts/handlequeued.php b/scripts/handlequeued.php
index 8158849695e92cad7664051cd6edabdd7414ea83..0d77030c3f40b8542b330727538cc411532051da 100755 (executable)
--- a/scripts/handlequeued.php
+++ b/scripts/handlequeued.php
@@ -38,19 +38,21 @@ $queue = trim($args[0]);
 $noticeId = intval($args[1]);
 
 $qm = QueueManager::get();
-$handler = $qm->getHandler($queue);
-if (!$handler) {
+try {
+    $handler = $qm->getHandler($queue);
+    $notice = Notice::getByID($noticeId);
+    $result = $handler->handle($notice);
+} catch (NoQueueHandlerException $e) {
     print "No handler for queue '$queue'.\n";
     exit(1);
-}
-
-$notice = Notice::staticGet('id', $noticeId);
-if (empty($notice)) {
-    print "Invalid notice id $noticeId\n";
+} catch (NoResultException $e) {
+    print "{$e->getMessage()}\n";
+    exit(1);
+} catch (Exception $e) {
+    print "Exception thrown while handling: {$e->getMessage()}\n";
     exit(1);
 }
-
-if (!$handler->handle($notice)) {
+if (!$result) {
     print "Failed to handle notice id $noticeId on queue '$queue'.\n";
     exit(1);
 }