clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add additional timeout checks

This commit is contained in:
Michael 2022-05-14 11:09:59 +00:00
parent f8d929d94e
commit 43dbd1c396
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Worker/APDelivery.php
View File

@ -23,6 +23,7 @@ namespace Friendica\Worker;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\GServer; use Friendica\Model\GServer;
use Friendica\Model\Post; use Friendica\Model\Post;
@ -152,6 +153,15 @@ class APDelivery
$success = $response->isSuccess(); $success = $response->isSuccess();
$timeout = $response->isTimeout(); $timeout = $response->isTimeout();
if (!$success) { if (!$success) {
$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
if (!$timeout && $xrd_timeout && ($runtime > $xrd_timeout)) {
$timeout = true;
}
$curl_timeout = DI::config()->get('system', 'curl_timeout');
if (!$timeout && $curl_timeout && ($runtime > $curl_timeout)) {
$timeout = true;
}
Logger::debug('Delivery failed', ['retcode' => $response->getReturnCode(), 'timeout' => $timeout, 'runtime' => round($runtime, 3), 'uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox]); Logger::debug('Delivery failed', ['retcode' => $response->getReturnCode(), 'timeout' => $timeout, 'runtime' => round($runtime, 3), 'uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox]);
} }
if ($uri_id) { if ($uri_id) {