We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 9167ba8d authored by Evan Prodromou's avatar Evan Prodromou

ActivityImporter catches thrown exceptions by plugins and marks entry done

parent 97debbab
...@@ -63,9 +63,9 @@ class ActivityImporter extends QueueHandler ...@@ -63,9 +63,9 @@ class ActivityImporter extends QueueHandler
$done = null; $done = null;
if (Event::handle('StartImportActivity', try {
array($user, $author, $activity, $trusted, &$done))) { if (Event::handle('StartImportActivity',
try { array($user, $author, $activity, $trusted, &$done))) {
switch ($activity->verb) { switch ($activity->verb) {
case ActivityVerb::FOLLOW: case ActivityVerb::FOLLOW:
$this->subscribeProfile($user, $author, $activity); $this->subscribeProfile($user, $author, $activity);
...@@ -83,10 +83,10 @@ class ActivityImporter extends QueueHandler ...@@ -83,10 +83,10 @@ class ActivityImporter extends QueueHandler
Event::handle('EndImportActivity', Event::handle('EndImportActivity',
array($user, $author, $activity, $trusted)); array($user, $author, $activity, $trusted));
$done = true; $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; return $done;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment