eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

More aggressively avoid OOM errors in useractivitystream

Browse Source
This commit is contained in:
Evan Prodromou 2013-05-24 09:19:17 -04:00
parent 9d42137024
commit bf18684509
1 changed files with 57 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
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();
@ -74,15 +75,24 @@ class UserActivityStream extends AtomUserNoticeFeed
$objs = array_merge($subscriptions, $subscribers, $groups, $faves, $notices); $objs = array_merge($subscriptions, $subscribers, $groups, $faves, $notices);
$subscriptions = null;
$subscribers = null;
$groups = null;
$faves = null;
unset($subscriptions);
unset($subscribers);
unset($groups);
unset($faves);
// Sort by create date // Sort by create date
usort($objs, 'UserActivityStream::compareObject'); usort($objs, 'UserActivityStream::compareObject');
// 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) {
$this->activities[] = $obj->asActivity(); $this->objs = $objs;
}
} }
/** /**
@ -92,29 +102,66 @@ class UserActivityStream extends AtomUserNoticeFeed
function renderEntries() function renderEntries()
{ {
$end = time() + 1; $end = time() + 1;
foreach ($this->activities as $act) { $i = 0;
foreach ($this->objs as $obj) {
$i++;
try {
$act = $obj->asActivity();
} catch (Exception $e) {
common_log(LOG_ERR, $e->getMessage());
continue;
}
$start = $act->time; $start = $act->time;
if ($this->outputMode == self::OUTPUT_RAW && $start != $end) { if ($this->outputMode == self::OUTPUT_RAW && $start != $end) {
// In raw mode, we haven't pre-fetched notices. // In raw mode, we haven't pre-fetched notices.
// Grab the chunks of notices between other activities. // Grab the chunks of notices between other activities.
try {
$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) {
common_log(LOG_ERR, $e->getMessage());
continue;
}
$nact = null;
unset($nact);
}
} catch (Exception $e) {
common_log(LOG_ERR, $e->getMessage());
} }
} }
$notices = null;
unset($notices);
// Only show the author sub-element if it's different from default user // Only show the author sub-element if it's different from default user
$act->outputTo($this, false, ($act->actor->id != $this->user->uri)); $act->outputTo($this, false, ($act->actor->id != $this->user->uri));
$act = null;
unset($act);
$end = $start; $end = $start;
} }
if ($this->outputMode == self::OUTPUT_RAW) { if ($this->outputMode == self::OUTPUT_RAW) {
// Grab anything after the last pre-sorted activity. // Grab anything after the last pre-sorted activity.
try {
$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) {
common_log(LOG_ERR, $e->getMessage());
continue;
}
}
} catch (Exception $e) {
common_log(LOG_ERR, $e->getMessage());
} }
} }
} }