Commit cfcc8dc3 authored by Vincent Pelletier's avatar Vincent Pelletier

Remove an unused "node" local variable (found by pylint).

Avoid using a local variable to display just one in a log.
Fix some inconsistently-named variables.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@1048 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 3db3bf56
...@@ -98,10 +98,7 @@ class AdminEventHandler(EventHandler): ...@@ -98,10 +98,7 @@ class AdminEventHandler(EventHandler):
self.app.dispatcher.register(msg_id, conn, {'msg_id' : packet.getId()}) self.app.dispatcher.register(msg_id, conn, {'msg_id' : packet.getId()})
def handleAddPendingNodes(self, conn, packet, uuid_list): def handleAddPendingNodes(self, conn, packet, uuid_list):
uuids = ', '.join([dump(uuid) for uuid in uuid_list]) logging.info('Add nodes %s' % [dump(uuid) for uuid in uuid_list])
logging.info('Add nodes %s' % uuids)
uuid = conn.getUUID()
node = self.app.nm.getNodeByUUID(uuid)
# forward the request to primary # forward the request to primary
master_conn = self.app.master_conn master_conn = self.app.master_conn
if master_conn is None: if master_conn is None:
...@@ -166,14 +163,14 @@ class MasterEventHandler(EventHandler): ...@@ -166,14 +163,14 @@ class MasterEventHandler(EventHandler):
def handleAnswerPartitionTable(self, conn, packet, ptid, row_list): def handleAnswerPartitionTable(self, conn, packet, ptid, row_list):
logging.debug("handleAnswerPartitionTable") logging.debug("handleAnswerPartitionTable")
def handleNotifyClusterInformation(self, con, packet, cluster_state): def handleNotifyClusterInformation(self, conn, packet, cluster_state):
logging.debug("handleNotifyClusterInformation") logging.debug("handleNotifyClusterInformation")
class MasterBaseEventHandler(EventHandler): class MasterBaseEventHandler(EventHandler):
""" This is the base class for connection to primary master node""" """ This is the base class for connection to primary master node"""
def handleNotifyClusterInformation(self, con, packet, cluster_state): def handleNotifyClusterInformation(self, conn, packet, cluster_state):
self.app.cluster_state = cluster_state self.app.cluster_state = cluster_state
def handleNotifyNodeInformation(self, conn, packet, node_list): def handleNotifyNodeInformation(self, conn, packet, node_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