afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleaned up broadcast_node to use nodes directly

Browse source
This commit is contained in:
Blake Harnden 2020-03-22 16:38:15 -07:00
parent fd7db64f6d
commit 33bcc24d88
8 changed files with 39 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

3
daemon/core/api/grpc/server.py
View file

@ -721,8 +721,7 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
if request.source:
source = request.source
if not has_geo:
node_data = node.data(source=source)
session.broadcast_node(node_data)
session.broadcast_node(node, source=source)
except CoreError:
result = False
return core_pb2.EditNodeResponse(result=result)

13
daemon/core/api/tlv/corehandlers.py
View file

@ -1836,24 +1836,16 @@ class CoreHandler(socketserver.BaseRequestHandler):
Return API messages that describe the current session.
"""
# find all nodes and links
nodes_data = []
links_data = []
with self.session._nodes_lock:
for node_id in self.session.nodes:
node = self.session.nodes[node_id]
node_data = node.data(message_type=MessageFlags.ADD)
if node_data:
nodes_data.append(node_data)
self.session.broadcast_node(node, MessageFlags.ADD)
node_links = node.all_link_data(flags=MessageFlags.ADD)
for link_data in node_links:
links_data.append(link_data)
# send all nodes first, so that they will exist for any links
for node_data in nodes_data:
self.session.broadcast_node(node_data)
for link_data in links_data:
self.session.broadcast_link(link_data)
@ -1960,8 +1952,9 @@ class CoreHandler(socketserver.BaseRequestHandler):
)
self.session.broadcast_config(config_data)
node_count = self.session.get_node_count()
logging.info(
"informed GUI about %d nodes and %d links", len(nodes_data), len(links_data)
"informed GUI about %d nodes and %d links", node_count, len(links_data)
)