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

Distinguish notice saving errors from others for Salmon

This commit is contained in:
Mikael Nordfeldth 2016-01-16 22:36:42 +01:00
parent 4678546d33
commit deda83fdef
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Notice.php
View File

@ -950,7 +950,7 @@ class Notice extends Managed_DataObject
$object = null;
Event::handle('StoreActivityObject', array($act, $stored, $options, &$object));
if (empty($object)) {
throw new ServerException('Unsuccessful call to StoreActivityObject '.$stored->getUri() . ': '.$act->asString());
throw new NoticeSaveException('Unsuccessful call to StoreActivityObject '._ve($stored->getUri()) . ': '._ve($act->asString()));
}
// If something changed in the Notice during StoreActivityObject

17
lib/noticesaveexception.php Normal file
View File

@ -0,0 +1,17 @@
<?php
if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Base exception class for when a notice cannot be saved
*
* @category Exception
* @package GNUsocial
* @author Mikael Nordfeldth <mmn@hethane.se>
* @license https://www.gnu.org/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link https://gnu.io/social
*/
class NoticeSaveException extends ServerException
{
}

2
plugins/OStatus/lib/salmonaction.php
View File

@ -109,6 +109,8 @@ class SalmonAction extends Action
// duplicate? Maybe someone's database is out of sync?
// Let's just accept it and move on.
common_log(LOG_INFO, 'Salmon slap carried an event which had already been fulfilled.');
} catch (NoticeSaveException $e) {
common_debug('Notice::saveActivity did not save our '._ve($this->activity->verb).' activity, trying old-fashioned salmon saving.');
}
try {