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:23:11 -0800
commit11abd4bfb70179faad3b4b0509b68403ddfc1ed9 (patch)
tree1c335e273e061ffb192d0b30b90f2f8a5b28e618
parentb771a8bb2124d4e48df2e3d3d3078c4de1da3483 (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();