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

updated emane link monitor to not run when there is nothing to monitor, added better logging about what is being monitored

Browse source
This commit is contained in:
Blake Harnden 2020-03-30 12:26:08 -07:00
parent 7e0efa7020
commit 16764c702b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/emane/linkmonitor.py
View file

@ -100,6 +100,7 @@ class EmaneClient:
else: else:
logging.warning("unknown emane link model: %s", emane_model) logging.warning("unknown emane link model: %s", emane_model)
continue continue
logging.info("monitoring links nem(%s) model(%s)", nem_id, emane_model)
loss_table.mac_id = mac_id loss_table.mac_id = mac_id
self.nems[nem_id] = loss_table self.nems[nem_id] = loss_table
@ -187,6 +188,9 @@ class EmaneLinkMonitor:
self.link_interval = int(self.emane_manager.get_config("link_interval")) self.link_interval = int(self.emane_manager.get_config("link_interval"))
self.link_timeout = int(self.emane_manager.get_config("link_timeout")) self.link_timeout = int(self.emane_manager.get_config("link_timeout"))
self.initialize() self.initialize()
if not self.clients:
logging.info("no valid emane models to monitor links")
return
self.scheduler = sched.scheduler() self.scheduler = sched.scheduler()
self.scheduler.enter(0, 0, self.check_links) self.scheduler.enter(0, 0, self.check_links)
self.running = True self.running = True
@ -197,13 +201,13 @@ class EmaneLinkMonitor:
addresses = self.get_addresses() addresses = self.get_addresses()
for address in addresses: for address in addresses:
client = EmaneClient(address) client = EmaneClient(address)
if client.nems:
self.clients.append(client) self.clients.append(client)
def get_addresses(self) -> List[str]: def get_addresses(self) -> List[str]:
addresses = [] addresses = []
nodes = self.emane_manager.getnodes() nodes = self.emane_manager.getnodes()
for node in nodes: for node in nodes:
logging.info("link monitor node: %s", node.name)
for netif in node.netifs(): for netif in node.netifs():
if isinstance(netif.net, CtrlNet): if isinstance(netif.net, CtrlNet):
ip4 = None ip4 = None