summaryrefslogtreecommitdiffstats
path: root/modules-available/dnbd3/inc
diff options
context:
space:
mode:
authorSimon Rettberg2017-11-13 23:44:39 +0100
committerSimon Rettberg2017-11-13 23:44:39 +0100
commitf8e86ae55fb0843477b8fa52b9c2f9b908d05195 (patch)
tree58d9307ce6d9f427b9f301ee9f212b17639ce404 /modules-available/dnbd3/inc
parent[inc/Taskmanager] Fix phpdoc (diff)
downloadslx-admin-f8e86ae55fb0843477b8fa52b9c2f9b908d05195.tar.gz
slx-admin-f8e86ae55fb0843477b8fa52b9c2f9b908d05195.tar.xz
slx-admin-f8e86ae55fb0843477b8fa52b9c2f9b908d05195.zip
[dnbd3] Extend server details page (altservers, config)
Diffstat (limited to 'modules-available/dnbd3/inc')
-rw-r--r--modules-available/dnbd3/inc/dnbd3.inc.php11
-rw-r--r--modules-available/dnbd3/inc/dnbd3rpc.inc.php10
2 files changed, 20 insertions, 1 deletions
diff --git a/modules-available/dnbd3/inc/dnbd3.inc.php b/modules-available/dnbd3/inc/dnbd3.inc.php
index eb41c000..9607c544 100644
--- a/modules-available/dnbd3/inc/dnbd3.inc.php
+++ b/modules-available/dnbd3/inc/dnbd3.inc.php
@@ -3,6 +3,7 @@
class Dnbd3 {
const PROP_ENABLED = 'dnbd3.enabled';
+ const PROP_NFS_FALLBACK = 'dnbd3.nfs-fallback';
public static function isEnabled()
{
@@ -19,6 +20,16 @@ class Dnbd3 {
return $task;
}
+ public static function hasNfsFallback()
+ {
+ return Property::get(self::PROP_NFS_FALLBACK, 0) ? true : false;
+ }
+
+ public static function setNfsFallback($bool)
+ {
+ Property::set(self::PROP_NFS_FALLBACK, $bool ? 1 : 0);
+ }
+
public static function getLocalStatus()
{
diff --git a/modules-available/dnbd3/inc/dnbd3rpc.inc.php b/modules-available/dnbd3/inc/dnbd3rpc.inc.php
index 35d79a31..cdcda508 100644
--- a/modules-available/dnbd3/inc/dnbd3rpc.inc.php
+++ b/modules-available/dnbd3/inc/dnbd3rpc.inc.php
@@ -15,9 +15,11 @@ class Dnbd3Rpc {
* @param bool $clients include client list
* @param bool $images include image list
* @param bool $diskSpace include disk space stats
+ * @param bool $config get config
+ * @param bool $altservers list of alt servers with status
* @return int|array the queried data as an array, or false on error
*/
- public static function query($server, $port, $stats, $clients, $images, $diskSpace)
+ public static function query($server, $port, $stats, $clients, $images, $diskSpace = false, $config = false, $altservers = false)
{
// Special case - local server
if ($server === '<self>') {
@@ -36,6 +38,12 @@ class Dnbd3Rpc {
if ($diskSpace) {
$url .= 'q=space&';
}
+ if ($config) {
+ $url .= 'q=config&';
+ }
+ if ($altservers) {
+ $url .= 'q=altservers&';
+ }
$str = Download::asString($url, 3, $code);
if ($str === false)
return self::QUERY_UNREACHABLE;