Merge pull request #141 from TimothyAsir/master

Updated server status based on glusterd running status

1 files changed, 8 insertions, 6 deletions

diff --git a/src/com.gluster.storage.management.server.scripts/src/get_server_details.py b/src/com.gluster.storage.management.server.scripts/src/get_server_details.py
index 2beb685b..cda1518b 100755
--- a/src/com.gluster.storage.management.server.scripts/src/get_server_details.py
+++ b/src/com.gluster.storage.management.server.scripts/src/get_server_details.py
@@ -39,6 +39,14 @@ def getServerDetails(listall):
     serverTag = responseDom.appendTagRoute("server")
     serverTag.appendChild(responseDom.createTag("name", serverName))
     serverTag.appendChild(responseDom.createTag("domainname", domain[0]))
+    if Utils.runCommand("pidof glusterd") == 0:
+        serverTag.appendChild(responseDom.createTag("status", "ONLINE"))
+    else:
+        serverTag.appendChild(responseDom.createTag("status", "OFFLINE"))
+    serverTag.appendChild(responseDom.createTag("cpuUsage", str(cpu)))
+    serverTag.appendChild(responseDom.createTag("totalMemory", str(convertKbToMb(meminfo['MemTotal']))))
+    serverTag.appendChild(responseDom.createTag("memoryInUse", str(convertKbToMb(meminfo['MemUsed']))))
+    serverTag.appendChild(responseDom.createTag("uuid", None))
 
     for dns in nameServerList:
         serverTag.appendChild(responseDom.createTag("dns%s" % str(nameServerList.index(dns) +1) , dns))
@@ -90,12 +98,6 @@ def getServerDetails(listall):
         Utils.log("Failed to get disk details")
         sys.exit(1)
 
-    serverTag.appendChild(responseDom.createTag("cpuUsage", str(cpu)))
-    serverTag.appendChild(responseDom.createTag("totalMemory", str(convertKbToMb(meminfo['MemTotal']))))
-    serverTag.appendChild(responseDom.createTag("memoryInUse", str(convertKbToMb(meminfo['MemUsed']))))
-    serverTag.appendChild(responseDom.createTag("status", "ONLINE"))
-    serverTag.appendChild(responseDom.createTag("uuid", None))
-
     serverTag.appendChild(diskDom.getElementsByTagRoute("disks")[0])
     return serverTag