Merge branch 'testing' into 0.9.x

1 files changed, 5 insertions, 1 deletions

diff --git a/plugins/OStatus/lib/pushinqueuehandler.php b/plugins/OStatus/lib/pushinqueuehandler.php
index a90f52df2..1fd29ae30 100644
--- a/plugins/OStatus/lib/pushinqueuehandler.php
+++ b/plugins/OStatus/lib/pushinqueuehandler.php
@@ -40,7 +40,11 @@ class PushInQueueHandler extends QueueHandler
 
         $feedsub = FeedSub::staticGet('id', $feedsub_id);
         if ($feedsub) {
-            $feedsub->receive($post, $hmac);
+            try {
+                $feedsub->receive($post, $hmac);
+            } catch(Exception $e) {
+                common_log(LOG_ERR, "Exception during PuSH input processing for $feedsub->uri: " . $e->getMessage());
+            }
         } else {
             common_log(LOG_ERR, "Discarding POST to unknown feed subscription id $feedsub_id");
         }