From 85575ed19b0e76b4067636f007a14ef86adc906f Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 9 Jun 2011 16:20:58 +0530 Subject: Bug fixed in vmware-discover-servers.py. Added timestamp to check recent response. --- .../WebContent/scripts/vmware-discover-servers.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/com.gluster.storage.management.server/WebContent/scripts') diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py b/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py index 6ac15fed..80e6101c 100755 --- a/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py +++ b/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py @@ -23,6 +23,8 @@ import struct import syslog import Globals import Common +import time +from XmlHandler import * class TimeoutException(Exception): pass @@ -50,7 +52,12 @@ def serverDiscoveryRequest(multiCastGroup, port): while True: response = socketReceive.recvfrom(200) if response and response[0].upper() != "SERVERDISCOVERY": - servers.append(response[0]) + dom = XDOM() + dom.parseString(response[0]) + responsetime = dom.getTextByTagRoute("response.time") + servername = dom.getTextByTagRoute("response.servername") + if time.time() - float(responsetime) < 60: + servers.append(servername) signal.signal(signal.SIGALRM, timeoutSignal) signal.alarm(3) except TimeoutException: -- cgit From 03deae0a3067483df28299d7690a10e182d1ef2f Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Thu, 9 Jun 2011 19:46:40 +0530 Subject: SSL communication between console and gateway --- src/com.gluster.storage.management.server/WebContent/scripts/Globals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/com.gluster.storage.management.server/WebContent/scripts') diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py b/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py index 9ae53491..877c6c68 100644 --- a/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py +++ b/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py @@ -64,7 +64,7 @@ WEBDAV_DOCUMENT_ROOT_DIR = "/var/www/html" UPDATES_DIR = "/UPDATES" TRANSPORT_HOME_DIR = "/transport" GLUSTERFS_LOG_DIR = "/var/log/glusterfs" -LOG_DIR = "/var/log/glustermc" +LOG_DIR = "/var/log/glustermg" GLUSTER_UPDATES_FILE = "updates.xml" INSTALLER_STATUS_FILE = "/var/log/install-server-status.log" -- cgit