daemon: adjustment for emane monitor shutdown to avoid locking
This commit is contained in:
parent
5bc3345d37
commit
6b5148566c
1 changed files with 3 additions and 3 deletions
|
@ -613,11 +613,11 @@ class EmaneManager:
|
||||||
self.doeventloop = False
|
self.doeventloop = False
|
||||||
if self.service is not None:
|
if self.service is not None:
|
||||||
self.service.breakloop()
|
self.service.breakloop()
|
||||||
|
if self.eventmonthread is not None:
|
||||||
|
self.eventmonthread.join()
|
||||||
|
self.eventmonthread = None
|
||||||
# reset the service, otherwise nextEvent won"t work
|
# reset the service, otherwise nextEvent won"t work
|
||||||
self.deleteeventservice()
|
self.deleteeventservice()
|
||||||
if self.eventmonthread is not None:
|
|
||||||
self.eventmonthread.join()
|
|
||||||
self.eventmonthread = None
|
|
||||||
|
|
||||||
def eventmonitorloop(self) -> None:
|
def eventmonitorloop(self) -> None:
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in a new issue