summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.server/WebContent
diff options
context:
space:
mode:
authorShireesh Anjal <anjalshireesh@gmail.com>2011-06-09 07:18:10 -0700
committerShireesh Anjal <anjalshireesh@gmail.com>2011-06-09 07:18:10 -0700
commit81e667e15bb51c6f998050c5dee231fb433845c9 (patch)
tree9ffaa50015d4eb0200d6192dd1b99ec6c7baad66 /src/com.gluster.storage.management.server/WebContent
parent88d3c1664d867df409589911afd42277cff5a1dc (diff)
parente7438d4a3e5990c69820f37c80bd4c9a53247ef8 (diff)
Merge pull request #65 from TimothyAsir/master
Bug fixed in vmware-discover-servers.py. Added timestamp to check recent response.
Diffstat (limited to 'src/com.gluster.storage.management.server/WebContent')
-rwxr-xr-xsrc/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py9
1 files changed, 8 insertions, 1 deletions
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: