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

updated broker.py logging to not be as noisy by default

Browse source
This commit is contained in:
Blake Harnden 2019-09-27 15:31:19 -07:00
parent ce27a43486
commit b961a8a959
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
daemon/core/api/tlv/broker.py
View file

@ -318,13 +318,13 @@ class CoreBroker(object):
# leave this socket connected # leave this socket connected
return return
logging.info( logging.debug(
"closing connection with %s @ %s:%s", name, server.host, server.port "closing connection with %s @ %s:%s", name, server.host, server.port
) )
server.close() server.close()
del self.servers[name] del self.servers[name]
logging.info("adding broker server(%s): %s:%s", name, host, port) logging.debug("adding broker server(%s): %s:%s", name, host, port)
server = CoreDistributedServer(name, host, port) server = CoreDistributedServer(name, host, port)
if host is not None and port is not None: if host is not None and port is not None:
try: try:
@ -492,7 +492,7 @@ class CoreBroker(object):
:raises core.CoreError: when node to add net tunnel to does not exist :raises core.CoreError: when node to add net tunnel to does not exist
""" """
net = self.session.get_node(node_id) net = self.session.get_node(node_id)
logging.info("adding net tunnel for: id(%s) %s", node_id, net) logging.debug("adding net tunnel for: id(%s) %s", node_id, net.name)
# add other nets here that do not require tunnels # add other nets here that do not require tunnels
if isinstance(net, EmaneNet): if isinstance(net, EmaneNet):
@ -501,21 +501,21 @@ class CoreBroker(object):
server_interface = getattr(net, "serverintf", None) server_interface = getattr(net, "serverintf", None)
if isinstance(net, CtrlNet) and server_interface is not None: if isinstance(net, CtrlNet) and server_interface is not None:
logging.warning( logging.debug(
"control networks with server interfaces do not need a tunnel" "control networks with server interfaces do not need a tunnel"
) )
return None return None
servers = self.getserversbynode(node_id) servers = self.getserversbynode(node_id)
if len(servers) < 2: if len(servers) < 2:
logging.warning("not enough servers to create a tunnel: %s", servers) logging.debug("not enough servers to create a tunnel for node: %s", node_id)
return None return None
hosts = [] hosts = []
for server in servers: for server in servers:
if server.host is None: if server.host is None:
continue continue
logging.info("adding server host for net tunnel: %s", server.host) logging.debug("adding server host for net tunnel: %s", server.host)
hosts.append(server.host) hosts.append(server.host)
if len(hosts) == 0: if len(hosts) == 0:
@ -523,7 +523,7 @@ class CoreBroker(object):
# get IP address from API message sender (master) # get IP address from API message sender (master)
if session_client.client_address != "": if session_client.client_address != "":
address = session_client.client_address[0] address = session_client.client_address[0]
logging.info("adding session_client host: %s", address) logging.debug("adding session_client host: %s", address)
hosts.append(address) hosts.append(address)
r = [] r = []
@ -536,7 +536,7 @@ class CoreBroker(object):
myip = host myip = host
key = self.tunnelkey(node_id, IpAddress.to_int(myip)) key = self.tunnelkey(node_id, IpAddress.to_int(myip))
if key in self.tunnels.keys(): if key in self.tunnels.keys():
logging.info( logging.debug(
"tunnel already exists, returning existing tunnel: %s", key "tunnel already exists, returning existing tunnel: %s", key
) )
gt = self.tunnels[key] gt = self.tunnels[key]
@ -655,9 +655,9 @@ class CoreBroker(object):
:param int nodenum: node id to add :param int nodenum: node id to add
:return: nothing :return: nothing
""" """
logging.info("adding net to broker: %s", nodenum) logging.debug("adding net to broker: %s", nodenum)
self.network_nodes.add(nodenum) self.network_nodes.add(nodenum)
logging.info("broker network nodes: %s", self.network_nodes) logging.debug("broker network nodes: %s", self.network_nodes)
def addphys(self, nodenum): def addphys(self, nodenum):
""" """