From 93b1df1a1d3fcf6d285102f3cc1f79e6241aa393 Mon Sep 17 00:00:00 2001 From: zhongtao Date: Thu, 4 Jul 2024 10:58:38 +0800 Subject: [PATCH 115/121] bugfix for m_criService shutdown Signed-off-by: zhongtao --- src/daemon/entry/connect/grpc/grpc_service.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/daemon/entry/connect/grpc/grpc_service.cc b/src/daemon/entry/connect/grpc/grpc_service.cc index 300af082..fb5ec3cb 100644 --- a/src/daemon/entry/connect/grpc/grpc_service.cc +++ b/src/daemon/entry/connect/grpc/grpc_service.cc @@ -111,12 +111,12 @@ public: void Shutdown(void) { // call CRI to shutdown stream server, shutdown cri first to notify events thread to exit + m_criService.Shutdown(); + if (m_server != nullptr) { m_server->Shutdown(); } - - m_server->Shutdown(); - + // Shutdown daemon, this operation should remove socket file. for (const auto &address : m_socketPath) { if (address.find(UNIX_SOCKET_PREFIX) == 0) { -- 2.25.1