Simplify loop exit logic.

Also, don't add 10 to "t" on each iteration.

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

neo/master/app.py

@@ -226,15 +226,12 @@ class Application(object):
         # Wait until the connections are closed.
         self.primary = None
         self.primary_master_node = None
-        t = time()
-        while self.em.getClientList():
+        t = time() + 10
+        while self.em.getClientList() and time() < t:
             try:
                 self.em.poll(1)
             except ElectionFailure:
                 pass
-            if time() > t + 10:
-                # If too long, do not wait.
-                break
 
         # Close all connections.
         for conn in self.em.getClientList() + self.em.getServerList():