From fb0c3f4f991464e36932137730743131f8ace68c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 28 Oct 2010 12:58:30 -0700 Subject: [PATCH] Kill a ping queue item if we get an error on loading up the notice's poster's profile, rather than letting the item be retried over and over as if it were a transitory error. This shouldn't generally happen as it's an indicator of database inconsistency, but it's a condition we know happens. --- lib/ping.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/ping.php b/lib/ping.php index be2933ae34..abf1c4048e 100644 --- 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) { -- 2.39.5