X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGServer.php;h=1878befa9f2282440c44a3b0ad19351555cb047c;hb=3f309805919671ce0ae22f82f5a751050a07dce4;hp=10f4a3daf207eb32b2f79c799eedc432992cc833;hpb=360614d2cf3aceeb763ef1281ad5236878f5d735;p=friendica.git diff --git a/src/Model/GServer.php b/src/Model/GServer.php index 10f4a3daf2..1878befa9f 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -360,13 +360,18 @@ class GServer /** * Reset failed server status by gserver id * - * @param int $gsid + * @param int $gsid + * @param string $network */ - public static function setReachableById(int $gsid) + public static function setReachableById(int $gsid, string $network) { - $gserver = DBA::selectFirst('gserver', ['url', 'failed', 'next_contact'], ['id' => $gsid]); + $gserver = DBA::selectFirst('gserver', ['url', 'failed', 'next_contact', 'network'], ['id' => $gsid]); if (DBA::isResult($gserver) && $gserver['failed']) { - self::update(['failed' => false, 'last_contact' => DateTimeFormat::utcNow()], ['id' => $gsid]); + $fields = ['failed' => false, 'last_contact' => DateTimeFormat::utcNow()]; + if (!empty($network) && !in_array($gserver['network'], Protocol::FEDERATED)) { + $fields['network'] = $network; + } + self::update($fields, ['id' => $gsid]); Logger::info('Reset failed status for server', ['url' => $gserver['url']]); if (strtotime($gserver['next_contact']) < time()) {