diff options
| author | Dan Engelbrecht <[email protected]> | 2023-12-04 05:16:22 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-12-04 11:16:22 +0100 |
| commit | aeecf717fee464ac2b9700e571d19c0c51794d7b (patch) | |
| tree | c6b3abb9edca18d7b43b59b726b01245b26ba6ba /src/zenserver/zenserver.cpp | |
| parent | use 32 bit offset and size in BlockStoreLocation (#581) (diff) | |
| download | zen-aeecf717fee464ac2b9700e571d19c0c51794d7b.tar.xz zen-aeecf717fee464ac2b9700e571d19c0c51794d7b.zip | |
safe threadpool shutdown (#584)
* shut down thread pools earlier to worker threads has a chance to terminate before main thread atexit
Diffstat (limited to 'src/zenserver/zenserver.cpp')
| -rw-r--r-- | src/zenserver/zenserver.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp index 2430267c1..f663417fb 100644 --- a/src/zenserver/zenserver.cpp +++ b/src/zenserver/zenserver.cpp @@ -643,6 +643,8 @@ ZenServer::Cleanup() Flush(); + ShutdownWorkerPools(); + m_AdminService.reset(); m_VfsService.reset(); m_ObjStoreService.reset(); @@ -660,7 +662,6 @@ ZenServer::Cleanup() m_AuthMgr.reset(); m_Http = {}; m_JobQueue.reset(); - ShutdownWorkerPools(); } catch (std::exception& Ex) { |