GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Don't abort if an activity throws an exception when backing up

Browse Source
This commit is contained in:
Evan Prodromou 2013-05-23 15:02:30 -04:00
parent fc7d74050f
commit d7880c17ec
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/useractivitystream.php
View File

@ -67,6 +67,7 @@ class UserActivityStream extends AtomUserNoticeFeed
// Assume that everything but notices is feasible // Assume that everything but notices is feasible
// to pull at once and work with in memory... // to pull at once and work with in memory...
$subscriptions = $this->getSubscriptions(); $subscriptions = $this->getSubscriptions();
$subscribers = $this->getSubscribers(); $subscribers = $this->getSubscribers();
$groups = $this->getGroups(); $groups = $this->getGroups();
@ -81,7 +82,11 @@ class UserActivityStream extends AtomUserNoticeFeed
// We'll keep these around for later, and interleave them into // We'll keep these around for later, and interleave them into
// the output stream with the user's notices. // the output stream with the user's notices.
foreach ($objs as $obj) { foreach ($objs as $obj) {
$this->activities[] = $obj->asActivity(); try {
$this->activities[] = $obj->asActivity();
} catch (Exception $e) {
// Continue
}
} }
} }
@ -100,7 +105,12 @@ class UserActivityStream extends AtomUserNoticeFeed
// Grab the chunks of notices between other activities. // Grab the chunks of notices between other activities.
$notices = $this->getNoticesBetween($start, $end); $notices = $this->getNoticesBetween($start, $end);
foreach ($notices as $noticeAct) { foreach ($notices as $noticeAct) {
$noticeAct->asActivity()->outputTo($this, false, false); try {
$nact = $noticeAct->asActivity();
$nact->outputTo($this, false, false);
} catch (Exception $e) {
// Continue
}
} }
} }
@ -114,7 +124,12 @@ class UserActivityStream extends AtomUserNoticeFeed
// Grab anything after the last pre-sorted activity. // Grab anything after the last pre-sorted activity.
$notices = $this->getNoticesBetween(0, $end); $notices = $this->getNoticesBetween(0, $end);
foreach ($notices as $noticeAct) { foreach ($notices as $noticeAct) {
$noticeAct->asActivity()->outputTo($this, false, false); try {
$nact = $noticeAct->asActivity();
$nact->outputTo($this, false, false);
} catch (Exception $e) {
// Continue
}
} }
} }
} }