summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-11-25 15:21:51 -0800
committerBrion Vibber <brion@pobox.com>2009-11-25 15:21:51 -0800
commit2dc62d21f72e47e715f30446584d7e3af60102c0 (patch)
treea40ae2ba28903fb81bdd2ca3cebfaf0909306f60
parent4d71dbe98c0aa6347415d72b49378ae9b6f73f3f (diff)
Catch and report exceptions from notice_to_omb_notice() instead of letting the OMB queue handler die.
-rw-r--r--lib/omb.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/omb.php b/lib/omb.php
index 49496b774..e2a6d9f3f 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -67,7 +67,14 @@ function omb_hmac_sha1()
function omb_broadcast_notice($notice)
{
- $omb_notice = notice_to_omb_notice($notice);
+ try {
+ $omb_notice = notice_to_omb_notice($notice);
+ } catch (Exception $e) {
+ // @fixme we should clean up or highlight the problem item
+ common_log(LOG_ERR, 'Invalid OMB outgoing notice for notice ' . $notice->id);
+ common_log(LOG_ERR, 'Error status '.$e);
+ return true;
+ }
/* Get remote users subscribed to this profile. */
$rp = new Remote_profile();