summaryrefslogtreecommitdiffstats
path: root/modules-available/dnbd3/baseconfig/getconfig.inc.php
diff options
context:
space:
mode:
authorSimon Rettberg2017-10-26 16:58:14 +0200
committerSimon Rettberg2017-10-26 16:58:14 +0200
commit017fb7924f3551004607aa74dbc0b3431d6c01a1 (patch)
treecb6b1e90f5a13b7b2f9b1567a1bc472ae5a0aa10 /modules-available/dnbd3/baseconfig/getconfig.inc.php
parent[dnbd3] Implement settings dialog for automatic proxies (diff)
downloadslx-admin-017fb7924f3551004607aa74dbc0b3431d6c01a1.tar.gz
slx-admin-017fb7924f3551004607aa74dbc0b3431d6c01a1.tar.xz
slx-admin-017fb7924f3551004607aa74dbc0b3431d6c01a1.zip
[dnbd3] Improve server sorting, main-warning, errormsg, Taskmanager intergration
Diffstat (limited to 'modules-available/dnbd3/baseconfig/getconfig.inc.php')
-rw-r--r--modules-available/dnbd3/baseconfig/getconfig.inc.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules-available/dnbd3/baseconfig/getconfig.inc.php b/modules-available/dnbd3/baseconfig/getconfig.inc.php
index ae4d2924..d614dc6f 100644
--- a/modules-available/dnbd3/baseconfig/getconfig.inc.php
+++ b/modules-available/dnbd3/baseconfig/getconfig.inc.php
@@ -36,11 +36,12 @@ while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
}
$old = isset($servers[$ip]) ? $servers[$ip] : $defPrio;
if (is_null($row['locationid']) || !isset($locationsAssoc[$row['locationid']])) {
- $servers[$ip] = min($defPrio, $old);
+ $servers[$ip] = min($defPrio, $old) . '.' . mt_rand();
} else {
- $servers[$ip] = min($locationsAssoc[$row['locationid']], $old);
+ $servers[$ip] = min($locationsAssoc[$row['locationid']], $old) . '.' . mt_rand();
}
}
asort($servers, SORT_NUMERIC | SORT_ASC);
ConfigHolder::add('SLX_DNBD3_SERVERS', implode(' ', array_keys($servers)));
+ConfigHolder::add('SLX_VM_DNBD3', 'yes');