Use time.sleep instead of a busy loop to wait for one second to pass.

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@313 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/client/dispatcher.py

@@ -22,7 +22,7 @@ from neo.protocol import PING, Packet, CLIENT_NODE_TYPE, FINISH_TRANSACTION
 from neo.connection import MTClientConnection
 from neo.node import MasterNode
 
-from time import time
+import time
 import logging
 
 class Dispatcher(Thread):
@@ -76,71 +76,69 @@ class Dispatcher(Thread):
                 if app.pt is not None:
                     app.pt.clear()
                 master_index = 0
-                t = 0
                 conn = None
                 # Make application execute remaining message if any
                 app._waitMessage()
                 handler = ClientEventHandler(app, app.dispatcher)
                 while 1:
-                    if t + 1 < time():
-                        if app.pt is not None and app.pt.operational():
-                            # Connected to primary master node and got all informations
-                            break
-                        app.local_var.node_not_ready = 0
-                        if app.primary_master_node is None:
-                            # Try with master node defined in config
-                            try:
-                                addr, port = app.master_node_list[master_index].split(':')                        
-                            except IndexError:
-                                master_index = 0
-                                addr, port = app.master_node_list[master_index].split(':')
-                            port = int(port)
-                        else:
-                            addr, port = app.primary_master_node.getServer()
-                        # Request Node Identification
-                        conn = MTClientConnection(app.em, handler, (addr, port), connector_handler=connector)
-                        if app.nm.getNodeByServer((addr, port)) is None:
-                            n = MasterNode(server = (addr, port))
-                            app.nm.add(n)
-
-                        conn.lock()
+                    if app.pt is not None and app.pt.operational():
+                        # Connected to primary master node and got all informations
+                        break
+                    app.local_var.node_not_ready = 0
+                    if app.primary_master_node is None:
+                        # Try with master node defined in config
                         try:
-                            msg_id = conn.getNextId()
-                            p = Packet()
-                            p.requestNodeIdentification(msg_id, CLIENT_NODE_TYPE, app.uuid,
-                                                        '0.0.0.0', 0, app.name)
+                            addr, port = app.master_node_list[master_index].split(':')                        
+                        except IndexError:
+                            master_index = 0
+                            addr, port = app.master_node_list[master_index].split(':')
+                        port = int(port)
+                    else:
+                        addr, port = app.primary_master_node.getServer()
+                    # Request Node Identification
+                    conn = MTClientConnection(app.em, handler, (addr, port), connector_handler=connector)
+                    if app.nm.getNodeByServer((addr, port)) is None:
+                        n = MasterNode(server = (addr, port))
+                        app.nm.add(n)
 
-                            # Send message
-                            conn.addPacket(p)
-                            conn.expectMessage(msg_id)
-                            self.register(conn, msg_id, app.getQueue())
-                        finally:
-                            conn.unlock()
+                    conn.lock()
+                    try:
+                        msg_id = conn.getNextId()
+                        p = Packet()
+                        p.requestNodeIdentification(msg_id, CLIENT_NODE_TYPE, app.uuid,
+                                                    '0.0.0.0', 0, app.name)
 
-                        # Wait for answer
-                        while 1:
-                            try:
-                                self.em.poll(1)
-                            except TypeError:
+                        # Send message
+                        conn.addPacket(p)
+                        conn.expectMessage(msg_id)
+                        self.register(conn, msg_id, app.getQueue())
+                    finally:
+                        conn.unlock()
+
+                    # Wait for answer
+                    while 1:
+                        try:
+                            self.em.poll(1)
+                        except TypeError:
+                            break
+                        app._waitMessage()
+                        # Now check result
+                        if app.primary_master_node is not None:
+                            if app.primary_master_node == -1:
+                                # Connection failed, try with another master node
+                                app.primary_master_node = None
+                                master_index += 1
+                                break
+                            elif app.primary_master_node.getServer() != (addr, port):
+                                # Master node changed, connect to new one
+                                break
+                            elif app.local_var.node_not_ready:
+                                # Wait a bit and reask again
+                                break
+                            elif app.pt is not None and app.pt.operational():
+                                # Connected to primary master node
                                 break
-                            app._waitMessage()
-                            # Now check result
-                            if app.primary_master_node is not None:
-                                if app.primary_master_node == -1:
-                                    # Connection failed, try with another master node
-                                    app.primary_master_node = None
-                                    master_index += 1
-                                    break
-                                elif app.primary_master_node.getServer() != (addr, port):
-                                    # Master node changed, connect to new one
-                                    break
-                                elif app.local_var.node_not_ready:
-                                    # Wait a bit and reask again
-                                    break
-                                elif app.pt is not None and app.pt.operational():
-                                    # Connected to primary master node
-                                    break
-                        t = time()
+                    time.sleep(1)
 
                 logging.info("connected to primary master node %s:%d" %app.primary_master_node.getServer())
                 app.master_conn = conn