diff options
author | Brion Vibber <brion@pobox.com> | 2010-04-20 13:52:58 +0200 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-04-20 13:52:58 +0200 |
commit | df41287226d113f178ef66f320c8568566890fe9 (patch) | |
tree | 26cc4094f89dd76c1d95584c729ec4c32072610a /lib/distribqueuehandler.php | |
parent | 056cce4b5eed28751bbad97e0dc826ee5310ff39 (diff) | |
parent | 61098faf5dd2685ea00c110bb4a3c871da17a300 (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/distribqueuehandler.php')
-rw-r--r-- | lib/distribqueuehandler.php | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/distribqueuehandler.php b/lib/distribqueuehandler.php index d2be7a92c..8f4b72d5c 100644 --- a/lib/distribqueuehandler.php +++ b/lib/distribqueuehandler.php @@ -49,19 +49,22 @@ class DistribQueueHandler } /** - * Here's the meat of your queue handler -- you're handed a Notice - * object, which you may do as you will with. + * Handle distribution of a notice after we've saved it: + * @li add to local recipient inboxes + * @li send email notifications to local @-reply targets + * @li run final EndNoticeSave plugin events + * @li put any remaining post-processing into the queues * * If this function indicates failure, a warning will be logged * and the item is placed back in the queue to be re-run. * + * @fixme addToInboxes is known to fail sometimes with large recipient sets + * * @param Notice $notice * @return boolean true on success, false on failure */ function handle($notice) { - // XXX: do we need to change this for remote users? - try { $notice->addToInboxes(); } catch (Exception $e) { @@ -69,6 +72,12 @@ class DistribQueueHandler } try { + $notice->sendReplyNotifications(); + } catch (Exception $e) { + $this->logit($notice, $e); + } + + try { Event::handle('EndNoticeSave', array($notice)); // Enqueue for other handlers } catch (Exception $e) { |