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

daemon: adjustments for shutdown behavior to avoid issues when shutting down, when already shutdown for the various different cases, but to also make sure the pycore directory is removed

Browse source
This commit is contained in:
Blake Harnden 2020-09-24 14:17:15 -07:00
parent b195891b3b
commit 0306f77147
3 changed files with 9 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -315,10 +315,7 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
"""
logging.debug("stop session: %s", request)
session = self.get_session(request.session_id, context)
session.data_collect()
session.set_state(EventTypes.DATACOLLECT_STATE, send_event=True)
session.clear()
session.set_state(EventTypes.SHUTDOWN_STATE, send_event=True)
session.shutdown()
return core_pb2.StopSessionResponse(result=True)
def CreateSession(

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

@ -735,6 +735,11 @@ class CoreHandler(socketserver.BaseRequestHandler):
elif message.flags & MessageFlags.DELETE.value:
with self._shutdown_lock:
result = self.session.delete_node(node_id)
if result and self.session.get_node_count() == 0:
self.session.set_state(EventTypes.SHUTDOWN_STATE)
self.session.delete_nodes()
self.session.distributed.shutdown()
self.session.sdt.shutdown()
# if we deleted a node broadcast out its removal
if result and message.flags & MessageFlags.STRING.value: