Commit 9c0a0c9e authored by Julien Muchembled's avatar Julien Muchembled

client: code cleanup

parent cf413589
...@@ -115,10 +115,6 @@ class Application(object): ...@@ -115,10 +115,6 @@ class Application(object):
# _connecting_to_master_node is used to prevent simultaneous master # _connecting_to_master_node is used to prevent simultaneous master
# node connection attemps # node connection attemps
self._connecting_to_master_node = Lock() self._connecting_to_master_node = Lock()
# _nm ensure exclusive access to the node manager
lock = Lock()
self._nm_acquire = lock.acquire
self._nm_release = lock.release
self.compress = compress self.compress = compress
registerLiveDebugger(on_log=self.log) registerLiveDebugger(on_log=self.log)
......
...@@ -123,14 +123,13 @@ class ConnectionPool(object): ...@@ -123,14 +123,13 @@ class ConnectionPool(object):
cell_list.sort(key=self.getCellSortKey) cell_list.sort(key=self.getCellSortKey)
for cell in cell_list: for cell in cell_list:
node = cell.getNode() node = cell.getNode()
if node.isRunning(): conn = getConnForNode(node)
conn = getConnForNode(node) if conn is not None:
if conn is not None: yield node, conn
yield (node, conn) # Re-check if node is running, as our knowledge of its
# Re-check if node is running, as our knowledge of its # state can have changed during connection attempt.
# state can have changed during connection attempt. elif node.isRunning():
elif node.isRunning(): new_cell_list.append(cell)
new_cell_list.append(cell)
if not new_cell_list: if not new_cell_list:
break break
cell_list = new_cell_list cell_list = new_cell_list
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment