Commit 5203461f authored by Grégory Wisniewski's avatar Grégory Wisniewski

Fix address format in neoctl and admin node.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@883 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent d5f7fb10
...@@ -64,7 +64,7 @@ class AdminEventHandler(EventHandler): ...@@ -64,7 +64,7 @@ class AdminEventHandler(EventHandler):
except TypeError: except TypeError:
ip = "0.0.0.0" ip = "0.0.0.0"
port = 0 port = 0
node_information_list.append((node.getNodeType(), ip, port, node.getUUID(), node.getState())) node_information_list.append((node.getNodeType(), (ip, port), node.getUUID(), node.getState()))
p = protocol.answerNodeList(node_information_list) p = protocol.answerNodeList(node_information_list)
conn.answer(p, packet) conn.answer(p, packet)
......
...@@ -65,8 +65,8 @@ class CommandEventHandler(EventHandler): ...@@ -65,8 +65,8 @@ class CommandEventHandler(EventHandler):
if len(node_list) == 0: if len(node_list) == 0:
data = "No Node" data = "No Node"
else: else:
for node_type, ip, port, uuid, state in node_list: for node_type, (ip, port), uuid, state in node_list:
data += "\n%s - %s - %s:%s - %s" %(node_type, dump(uuid), ip, port, state) data += "\n%s - %s - %s:%s - %s" % (node_type, dump(uuid), ip, port, state)
self.app.result = data self.app.result = data
def handleAnswerNodeState(self, conn, packet, uuid, state): def handleAnswerNodeState(self, conn, packet, uuid, state):
......
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