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

daemon: updated emane shutdown to kill emane daemon for a given interface, instead of killall

Browse source
This commit is contained in:
Blake Harnden 2021-05-26 12:29:46 -07:00
parent 777097c85e
commit 3fcefc4d79
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
daemon/core/emane/emanemanager.py
View file

@ -525,22 +525,17 @@ class EmaneManager:
if self.links_enabled(): if self.links_enabled():
self.link_monitor.stop() self.link_monitor.stop()
# shutdown interfaces # shutdown interfaces
nodes = set()
for _, iface in self.get_ifaces(): for _, iface in self.get_ifaces():
node = iface.node node = iface.node
if not node.up: if not node.up:
continue continue
nodes.add(node) kill_cmd = f'pkill -f "emane.+{iface.name}"'
if isinstance(node, CoreNode): if isinstance(node, CoreNode):
iface.shutdown() iface.shutdown()
iface.poshook = None node.cmd(kill_cmd, wait=False)
kill_emaned = "killall -q emane"
# stop all emane daemons on associated nodes
for node in nodes:
if isinstance(node, CoreNode):
node.cmd(kill_emaned, wait=False)
else: else:
node.host_cmd(kill_emaned, wait=False) node.host_cmd(kill_cmd, wait=False)
iface.poshook = None
# stop emane event services # stop emane event services
while self.services: while self.services:
_, service = self.services.popitem() _, service = self.services.popitem()