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

Handle exceptions when salmon slapping

Browse Source 
Make it so notifyDeferred actually _always_ throws exceptions and handle
them in the places it is called.
This commit is contained in:
Mikael Nordfeldth 2016-01-20 14:55:41 +01:00
parent c393bc9563
commit 64e74d527f
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -376,6 +376,7 @@ class Ostatus_profile extends Managed_DataObject
public function notifyDeferred($entry, $actor) public function notifyDeferred($entry, $actor)
{ {
if ($this->salmonuri) { if ($this->salmonuri) {
try {
common_debug("OSTATUS: user {$actor->getNickname()} ({$actor->getID()}) wants to ping {$this->localProfile()->getNickname()} on {$this->salmonuri}"); common_debug("OSTATUS: user {$actor->getNickname()} ({$actor->getID()}) wants to ping {$this->localProfile()->getNickname()} on {$this->salmonuri}");
$data = array('salmonuri' => $this->salmonuri, $data = array('salmonuri' => $this->salmonuri,
'entry' => $this->notifyPrepXml($entry), 'entry' => $this->notifyPrepXml($entry),
@ -384,6 +385,10 @@ class Ostatus_profile extends Managed_DataObject
$qm = QueueManager::get(); $qm = QueueManager::get();
return $qm->enqueue($data, 'salmon'); return $qm->enqueue($data, 'salmon');
} catch (Exception $e) {
common_log(LOG_ERR, 'OSTATUS: Something went wrong when creating a Salmon slap: '._ve($e->getMessage()));
return false;
}
} }
return false; return false;