diff options
| author | Stefan Boberg <[email protected]> | 2025-10-29 09:37:37 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-10-29 09:37:37 +0100 |
| commit | 8dfe7f3b940ef8454687f8a8fd784094a017396f (patch) | |
| tree | fc9fadc9f52a2591d0aa40620e5bc7c6c669e36a /src | |
| parent | fix for Latch race (#617) (diff) | |
| download | zen-8dfe7f3b940ef8454687f8a8fd784094a017396f.tar.xz zen-8dfe7f3b940ef8454687f8a8fd784094a017396f.zip | |
make sure OpenProcessCache is initialized before use (#618)
previously, a null reference would be passed into ProjectStore constructor
Diffstat (limited to 'src')
| -rw-r--r-- | src/zenserver/storage/zenstorageserver.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/zenserver/storage/zenstorageserver.cpp b/src/zenserver/storage/zenstorageserver.cpp index 65de3eca2..e2f20f8b6 100644 --- a/src/zenserver/storage/zenstorageserver.cpp +++ b/src/zenserver/storage/zenstorageserver.cpp @@ -197,7 +197,8 @@ ZenStorageServer::InitializeServices(const ZenStorageServerConfig& ServerOptions ZEN_INFO("instantiating project service"); - m_JobQueue = MakeJobQueue(8, "bgjobs"); + m_JobQueue = MakeJobQueue(8, "bgjobs"); + m_OpenProcessCache = std::make_unique<OpenProcessCache>(); m_ProjectStore = new ProjectStore(*m_CidStore, m_DataRoot / "projects", m_GcManager, ProjectStore::Configuration{}); m_HttpProjectService.reset( @@ -548,8 +549,7 @@ ZenStorageServer::InitializeStructuredCache(const ZenStorageServerConfig& Server Config.NamespaceConfig.DiskLayerConfig.BucketConfig.LargeObjectThreshold = 128 * 1024 * 1024; } - m_CacheStore = new ZenCacheStore(m_GcManager, *m_JobQueue, m_DataRoot / "cache", Config, m_GcManager.GetDiskWriteBlocker()); - m_OpenProcessCache = std::make_unique<OpenProcessCache>(); + m_CacheStore = new ZenCacheStore(m_GcManager, *m_JobQueue, m_DataRoot / "cache", Config, m_GcManager.GetDiskWriteBlocker()); const ZenUpstreamCacheConfig& UpstreamConfig = ServerOptions.UpstreamCacheConfig; @@ -804,7 +804,6 @@ ZenStorageServer::Cleanup() m_UpstreamService.reset(); m_UpstreamCache.reset(); m_CacheStore = {}; - m_OpenProcessCache.reset(); m_HttpWorkspacesService.reset(); m_Workspaces.reset(); @@ -813,6 +812,7 @@ ZenStorageServer::Cleanup() m_CidStore.reset(); m_AuthService.reset(); m_AuthMgr.reset(); + m_OpenProcessCache.reset(); m_Http = {}; ShutdownWorkerPools(); |