ActivityImporter catches thrown exceptions by plugins and marks entry done
This commit is contained in:
parent
97debbab68
commit
9167ba8d2d
|
@ -63,9 +63,9 @@ class ActivityImporter extends QueueHandler
|
|||
|
||||
$done = null;
|
||||
|
||||
if (Event::handle('StartImportActivity',
|
||||
array($user, $author, $activity, $trusted, &$done))) {
|
||||
try {
|
||||
try {
|
||||
if (Event::handle('StartImportActivity',
|
||||
array($user, $author, $activity, $trusted, &$done))) {
|
||||
switch ($activity->verb) {
|
||||
case ActivityVerb::FOLLOW:
|
||||
$this->subscribeProfile($user, $author, $activity);
|
||||
|
@ -83,10 +83,10 @@ class ActivityImporter extends QueueHandler
|
|||
Event::handle('EndImportActivity',
|
||||
array($user, $author, $activity, $trusted));
|
||||
$done = true;
|
||||
} catch (Exception $e) {
|
||||
common_log(LOG_ERR, $e->getMessage());
|
||||
$done = true;
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
common_log(LOG_ERR, $e->getMessage());
|
||||
$done = true;
|
||||
}
|
||||
return $done;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user