Kill a ping queue item if we get an error on loading up the notice's poster's profile...

This shouldn't generally happen as it's an indicator of database inconsistency, but it's a condition we know happens.

diff --git a/lib/ping.php b/lib/ping.php
index be2933ae34016fb8dd17901e320ca86f6596c5be..abf1c4048edddb5a6c3f1bcbd783d75d9b4c9abe 100644 (file)
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -27,7 +27,14 @@ function ping_broadcast_notice($notice) {
 
        # Array of servers, URL => type
        $notify = common_config('ping', 'notify');
-       $profile = $notice->getProfile();
+    try {
+        $profile = $notice->getProfile();
+    } catch (Exception $e) {
+        // @todo: distinguish the 'broken notice/profile' case from more general
+        //        transitory errors.
+        common_log(LOG_ERR, "Exception getting notice profile: " . $e->getMessage());
+        return true;
+    }
        $tags = ping_notice_tags($notice);
 
        foreach ($notify as $notify_url => $type) {