Merge pull request #55 from TimothyAsir/master

Enhanced multicast_response.py and Fixed to many files open error.

2 files changed, 7 insertions, 8 deletions

diff --git a/src/com.gluster.storage.management.server.scripts/src/Utils.py b/src/com.gluster.storage.management.server.scripts/src/Utils.py
index 5140b641..f9b3254b 100644
--- a/src/com.gluster.storage.management.server.scripts/src/Utils.py
+++ b/src/com.gluster.storage.management.server.scripts/src/Utils.py
@@ -159,7 +159,9 @@ def isString(value):
 
 
 def getTempFileName():
-    return tempfile.mkstemp(prefix="GSP_")[1]
+    filedesc, filename = tempfile.mkstemp(prefix="GSP_")
+    os.close(filedesc)
+    return filename
 
 
 def runCommandBG(command, stdinFileObj=None, stdoutFileObj=None, stderrFileObj=None,
diff --git a/src/com.gluster.storage.management.server.scripts/src/multicast_response.py b/src/com.gluster.storage.management.server.scripts/src/multicast_response.py
index cb197101..baa3f830 100644
--- a/src/com.gluster.storage.management.server.scripts/src/multicast_response.py
+++ b/src/com.gluster.storage.management.server.scripts/src/multicast_response.py
@@ -30,10 +30,7 @@ def isinpeer():
     if status["Status"] == 0:

         if status["Stdout"].strip().upper() != "NO PEERS PRESENT":

             return True

-        #lines = status["Stdout"].split("\n")

-        #for line in lines:

-        #    if string.upper(line).startswith("HOSTNAME: %s" % string.upper(socket.gethostname)):

-        #        return True

+        return False

     Utils.log("command [%s] failed with [%d:%s]" % (command, status["Status"], os.strerror(status["Status"])))

     return False

 

@@ -50,11 +47,11 @@ def response(multiCastGroup, port):
 

     #TODO: Remove infinite loop and make this as a deamon (service)

     while True:

-        if isinpeer():

-            time.sleep(5)

-            continue

         request = socketRequest.recvfrom(1024)

         if request and request[0].upper() == "SERVERDISCOVERY":

+            if isinpeer():

+                time.sleep(5)

+                continue

             socketSend.sendto(socket.gethostname(), (multiCastGroup, port))

             request = None