From 3a6084d070ff13154a4ec162161203280e0cc9c1 Mon Sep 17 00:00:00 2001 From: "Bala.FA" Date: Thu, 21 Jul 2011 13:16:50 +0530 Subject: get_brick_status.py and get_server_status.py return status as string to stdout. Signed-off-by: Bala.FA --- .../src/get_brick_status.py | 15 +++++---------- .../src/get_server_status.py | 5 ++--- 2 files changed, 7 insertions(+), 13 deletions(-) (limited to 'src/com.gluster.storage.management.server.scripts') 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 8d827bd2..91622f1e 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 @@ -6,7 +6,6 @@ import os import sys import Utils -from XmlHandler import ResponseXml def main(): if len(sys.argv) != 3: @@ -17,28 +16,24 @@ def main(): brickName = sys.argv[2] pidFile = "/etc/glusterd/vols/%s/run/%s.pid" % (volumeName, brickName.replace(":", "-").replace("/", "-")) - responseDom = ResponseXml() - responseDom.appendTagRoute("volumeName", volumeName) - responseDom.appendTagRoute("brickName", brickName) if not os.path.exists(pidFile): - responseDom.appendTagRoute("brickStatus", "OFFLINE") + print "OFFLINE" else: try: fp = open(pidFile) pidString = fp.readline() fp.close() os.getpgid(int(pidString)) - responseDom.appendTagRoute("brickStatus", "ONLINE") + print "ONLINE" except IOError, e: Utils.log("failed to open file %s: %s" % (pidFile, str(e))) - responseDom.appendTagRoute("brickStatus", "UNKNOWN") + print "UNKNOWN" except ValueError, e: Utils.log("invalid pid %s in file %s: %s" % (pidString, pidFile, str(e))) - responseDom.appendTagRoute("brickStatus", "UNKNOWN") + print "UNKNOWN" except OSError, e: #Utils.log("failed to get process detail of pid %s: %s" % (pidString, str(e))) - responseDom.appendTagRoute("brickStatus", "OFFLINE") - print responseDom.toxml() + print "OFFLINE" sys.exit(0) if __name__ == "__main__": 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 4e089b4b..99432a72 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 @@ -6,7 +6,6 @@ import os import sys import Utils -from XmlHandler import ResponseXml def main(): if len(sys.argv) != 1: @@ -15,9 +14,9 @@ def main(): responseDom = ResponseXml() if Utils.runCommand("pidof glusterd") == 0: - responseDom.appendTagRoute("serverStatus", "ONLINE") + print "ONLINE" else: - responseDom.appendTagRoute("serverStatus", "OFFLINE") + print "OFFLINE" print responseDom.toxml() sys.exit(0) -- cgit