diff options
Diffstat (limited to 'modules-available/dnbd3/baseconfig/getconfig.inc.php')
| -rw-r--r-- | modules-available/dnbd3/baseconfig/getconfig.inc.php | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/modules-available/dnbd3/baseconfig/getconfig.inc.php b/modules-available/dnbd3/baseconfig/getconfig.inc.php index 6f484fc5..eff821fc 100644 --- a/modules-available/dnbd3/baseconfig/getconfig.inc.php +++ b/modules-available/dnbd3/baseconfig/getconfig.inc.php @@ -1,16 +1,21 @@ <?php -if (!Dnbd3::isEnabled()) return; +/** @var ?string $uuid */ +/** @var ?string $ip */ -if (!Dnbd3::hasNfsFallback()) { - ConfigHolder::add("SLX_VM_NFS", false, 1000); - ConfigHolder::add("SLX_VM_NFS_USER", false, 1000); - ConfigHolder::add("SLX_VM_NFS_PASSWD", false, 1000); +if (Dnbd3::isEnabled()) { + if (!Dnbd3::hasNfsFallback()) { + ConfigHolder::add("SLX_VM_NFS", false, 1000); + ConfigHolder::add("SLX_VM_NFS_USER", false, 1000); + ConfigHolder::add("SLX_VM_NFS_PASSWD", false, 1000); + } + + ConfigHolder::add('SLX_VM_DNBD3', 'yes'); } // Locations from closest to furthest (order) $locations = ConfigHolder::get('SLX_LOCATIONS'); -if ($locations === false) { +if ($locations === null) { $locationIds = [0]; } else { $locationIds = explode(' ', $locations); @@ -27,14 +32,14 @@ $res = Database::simpleQuery('SELECT s.fixedip, m.clientip, sxl.locationid FROM $locationsAssoc = array_flip($locationIds); $servers = array(); $fallback = array(); -while ($row = $res->fetch(PDO::FETCH_ASSOC)) { +foreach ($res as $row) { if ($row['fixedip'] === '<self>') { $row['fixedip'] = Property::getServerIp(); - $defPrio = 2000; + $defPrio = Dnbd3::preferLocal() ? 500 : 2000; } else { $defPrio = 1000; } - $ip = $row['fixedip'] ? $row['fixedip'] : $row['clientip']; + $ip = $row['fixedip'] ?: $row['clientip']; // See if this server is meant for the client at all if (!is_null($row['locationid']) && !isset($locationsAssoc[$row['locationid']])) { $fallback[$ip] = true; @@ -48,7 +53,7 @@ while ($row = $res->fetch(PDO::FETCH_ASSOC)) { $row['locationid'] = $serverLoc; } } - $old = isset($servers[$ip]) ? $servers[$ip] : $defPrio; + $old = $servers[$ip] ?? PHP_INT_MAX; if (is_null($row['locationid']) || !isset($locationsAssoc[$row['locationid']])) { $servers[$ip] = min($defPrio . '.' . mt_rand(), $old); } else { @@ -62,5 +67,4 @@ foreach ($servers as $k => $v) { asort($servers, SORT_NUMERIC | SORT_ASC); ConfigHolder::add('SLX_DNBD3_SERVERS', implode(' ', array_keys($servers))); -ConfigHolder::add('SLX_DNBD3_FALLBACK', implode(' ', array_keys($fallback))); -ConfigHolder::add('SLX_VM_DNBD3', 'yes'); +ConfigHolder::add('SLX_DNBD3_FALLBACK', implode(' ', array_keys($fallback)));
\ No newline at end of file |