diff options
Diffstat (limited to 'src/com.gluster.storage.management.server.scripts')
3 files changed, 9 insertions, 9 deletions
diff --git a/src/com.gluster.storage.management.server.scripts/src/get_brick_status.py b/src/com.gluster.storage.management.server.scripts/src/get_brick_status.py index 91622f1e..cf84080b 100755 --- a/src/com.gluster.storage.management.server.scripts/src/get_brick_status.py +++ b/src/com.gluster.storage.management.server.scripts/src/get_brick_status.py @@ -14,7 +14,7 @@ def main(): volumeName = sys.argv[1] brickName = sys.argv[2] - pidFile = "/etc/glusterd/vols/%s/run/%s.pid" % (volumeName, brickName.replace(":", "-").replace("/", "-")) + pidFile = "/etc/glusterd/vols/%s/run/%s.pid" % (volumeName, brickName.replace(":", "").replace("/", "-")) if not os.path.exists(pidFile): print "OFFLINE" 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 diff --git a/src/com.gluster.storage.management.server.scripts/src/get_server_status.py b/src/com.gluster.storage.management.server.scripts/src/get_server_status.py index 99432a72..a57428b6 100755 --- a/src/com.gluster.storage.management.server.scripts/src/get_server_status.py +++ b/src/com.gluster.storage.management.server.scripts/src/get_server_status.py @@ -12,12 +12,10 @@ def main(): sys.stderr.write("usage: %s\n" % os.path.basename(sys.argv[0])) sys.exit(-1) - responseDom = ResponseXml() if Utils.runCommand("pidof glusterd") == 0: print "ONLINE" else: print "OFFLINE" - print responseDom.toxml() sys.exit(0) if __name__ == "__main__": |