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

considerably more logging and error checking in AccountMover

Browse Source
This commit is contained in:
Evan Prodromou 2011-01-17 15:25:58 -05:00
parent feb3ae4c09
commit dce2824747
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/accountmover.php
View File

@ -110,21 +110,42 @@ class AccountMover
function move() function move()
{ {
$this->log(LOG_INFO,
"Moving user {$this->_user->nickname} to {$this->_remote->nickname}");
$stream = new UserActivityStream($this->_user); $stream = new UserActivityStream($this->_user);
$acts = array_reverse($stream->activities); $acts = array_reverse($stream->activities);
$this->log(LOG_INFO,
"Got {count($acts)} activities ".
"for {$this->_user->nickname}");
// Reverse activities to run in correct chron order // Reverse activities to run in correct chron order
foreach ($acts as $act) { foreach ($acts as $act) {
try {
$this->_moveActivity($act); $this->_moveActivity($act);
} catch (Exception $e) {
$this->log(LOG_ERR,
"Error moving activity {$act->id} {$act->verb}: " .
$e->getMessage());
continue;
} }
} }
$this->log(LOG_INFO,
"Finished moving user {$this->_user->nickname} ".
"to {$this->_remote->nickname}");
}
private function _moveActivity($act) private function _moveActivity($act)
{ {
switch ($act->verb) { switch ($act->verb) {
case ActivityVerb::FAVORITE: case ActivityVerb::FAVORITE:
$this->log(LOG_INFO,
"Moving favorite of {$act->objects[0]->id} by ".
"{$act->actor->id} to {$this->_remote->nickname}.");
// push it, then delete local // push it, then delete local
$this->_sink->postActivity($act); $this->_sink->postActivity($act);
$notice = Notice::staticGet('uri', $act->objects[0]->id); $notice = Notice::staticGet('uri', $act->objects[0]->id);
@ -135,8 +156,10 @@ class AccountMover
} }
break; break;
case ActivityVerb::POST: case ActivityVerb::POST:
$this->log(LOG_INFO,
"Moving notice {$act->objects[0]->id} by ".
"{$act->actor->id} to {$this->_remote->nickname}.");
// XXX: send a reshare, not a post // XXX: send a reshare, not a post
common_log(LOG_INFO, "Pushing notice {$act->objects[0]->id} to {$this->_remote->getURI()}");
$this->_sink->postActivity($act); $this->_sink->postActivity($act);
$notice = Notice::staticGet('uri', $act->objects[0]->id); $notice = Notice::staticGet('uri', $act->objects[0]->id);
if (!empty($notice)) { if (!empty($notice)) {
@ -144,6 +167,9 @@ class AccountMover
} }
break; break;
case ActivityVerb::JOIN: case ActivityVerb::JOIN:
$this->log(LOG_INFO,
"Moving group join of {$act->objects[0]->id} by ".
"{$act->actor->id} to {$this->_remote->nickname}.");
$this->_sink->postActivity($act); $this->_sink->postActivity($act);
$group = User_group::staticGet('uri', $act->objects[0]->id); $group = User_group::staticGet('uri', $act->objects[0]->id);
if (!empty($group)) { if (!empty($group)) {
@ -152,6 +178,9 @@ class AccountMover
break; break;
case ActivityVerb::FOLLOW: case ActivityVerb::FOLLOW:
if ($act->actor->id == $this->_user->uri) { if ($act->actor->id == $this->_user->uri) {
$this->log(LOG_INFO,
"Moving subscription to {$act->objects[0]->id} by ".
"{$act->actor->id} to {$this->_remote->nickname}.");
$this->_sink->postActivity($act); $this->_sink->postActivity($act);
$other = Profile::fromURI($act->objects[0]->id); $other = Profile::fromURI($act->objects[0]->id);
if (!empty($other)) { if (!empty($other)) {
@ -160,11 +189,17 @@ class AccountMover
} else { } else {
$otherUser = User::staticGet('uri', $act->actor->id); $otherUser = User::staticGet('uri', $act->actor->id);
if (!empty($otherUser)) { if (!empty($otherUser)) {
$this->log(LOG_INFO,
"Changing sub to {$act->objects[0]->id}".
"by {$act->actor->id} to {$this->_remote->nickname}.");
$otherProfile = $otherUser->getProfile(); $otherProfile = $otherUser->getProfile();
Subscription::start($otherProfile, $this->_remote); Subscription::start($otherProfile, $this->_remote);
Subscription::cancel($otherProfile, $this->_user->getProfile()); Subscription::cancel($otherProfile, $this->_user->getProfile());
} else { } else {
// It's a remote subscription. Do something here! $this->log(LOG_NOTICE,
"Not changing sub to {$act->objects[0]->id}".
"by remote {$act->actor->id} ".
"to {$this->_remote->nickname}.");
} }
} }
break; break;