Merge remote-tracking branch 'upstream/nightly' into nightly

[quix0rs-gnu-social.git] / lib / dbqueuemanager.php

diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php
index 5497a1089a30dccdb60e643550a0daee904c2f94..4440a4d93060f826c0a6f8559e2bda4edc3d2f4a 100644 (file)
--- a/lib/dbqueuemanager.php
+++ b/lib/dbqueuemanager.php
@@ -91,14 +91,16 @@ class DBQueueManager extends QueueManager
         
         try {
             $handler = $this->getHandler($qi->transport);
-            $result = $handler->handle($item)
+            $result = $handler->handle($item);
         } catch (NoQueueHandlerException $e) {
             $this->noHandlerFound($qi, $rep);
             return true;
+        } catch (AlreadyFulfilledException $e) {
+            $this->_log(LOG_ERR, "[{$qi->transport}:$rep] AlreadyFulfilledException thrown: {$e->getMessage()}");
+            $result = true;
         } catch (Exception $e) {
             $this->_log(LOG_ERR, "[{$qi->transport}:$rep] Exception thrown: {$e->getMessage()}");
-            $this->_fail($qi);
-            return true;
+            $result = false;
         }
 
         if ($result) {