Merge pull request #12512 from annando/available
A server is only reachable when the network can be detected
This commit is contained in:
commit
e5e4d142ce
1 changed files with 2 additions and 2 deletions
|
@ -191,11 +191,11 @@ class GServer
|
||||||
$condition = ['nurl' => Strings::normaliseLink($server)];
|
$condition = ['nurl' => Strings::normaliseLink($server)];
|
||||||
}
|
}
|
||||||
|
|
||||||
$gserver = DBA::selectFirst('gserver', ['url', 'next_contact', 'failed'], $condition);
|
$gserver = DBA::selectFirst('gserver', ['url', 'next_contact', 'failed', 'network'], $condition);
|
||||||
if (empty($gserver)) {
|
if (empty($gserver)) {
|
||||||
$reachable = true;
|
$reachable = true;
|
||||||
} else {
|
} else {
|
||||||
$reachable = !$gserver['failed'];
|
$reachable = !$gserver['failed'] && in_array($gserver['network'], Protocol::FEDERATED);
|
||||||
$server = $gserver['url'];
|
$server = $gserver['url'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue