From 7caf0cbc47156274cb53d3335e39cfcb73b37957 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 23 Aug 2011 11:57:13 +0530 Subject: Enhanced get_server_details.py to use socket library to get the server FQDN. Removed getServerFqdn() function from Utils.py --- .../src/backend/get_server_details.py | 2 +- .../src/common/Utils.py | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'src') diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py index 2b353f2a..e7dec088 100755 --- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py @@ -36,7 +36,7 @@ from optparse import OptionParser def getServerDetails(listall): - serverName = Utils.getServerFqdn() + serverName = socket.getfqdn() meminfo = getMeminfo() cpu = getCpuUsageAvg() nameServerList, domain, searchDomain = readResolvConfFile() diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py b/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py index 14988c4d..0b06b5ab 100644 --- a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py +++ b/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py @@ -452,13 +452,6 @@ def getInfinibandPortStatus(): return portkeys -def getServerFqdn(): - rv = runCommand("hostname --fqdn", output=True, root=True) - if not rv["Stderr"]: - return stripEmptyLines(rv["Stdout"]) - return socket.gethostname() - - def getServerCount(): try: return int(open(Globals.SERVER_COUNT_FILE).read().strip()) -- cgit