From ef9856d2d9c7ed73fa0440b8267c1767abc5585d Mon Sep 17 00:00:00 2001
From: Per Larsson <p3rl@protonmail.com>
Date: Wed, 23 Nov 2022 14:09:30 +0100
Subject: Map DDC cache key to content ID.

---
 zenserver/zenserver.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'zenserver/zenserver.cpp')

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index cabff7389..5db4caab7 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -261,11 +261,6 @@ public:
 		m_CidStore->Initialize(Config);
 		m_CidService.reset(new zen::HttpCidService{*m_CidStore});
 
-		ZEN_INFO("instantiating project service");
-
-		m_ProjectStore = new zen::ProjectStore(*m_CidStore, m_DataRoot / "projects", m_GcManager);
-		m_HttpProjectService.reset(new zen::HttpProjectService{*m_CidStore, m_ProjectStore});
-
 #if ZEN_WITH_EXEC_SERVICES
 
 		if (ServerOptions.ExecServiceEnabled)
@@ -294,14 +289,11 @@ public:
 		}
 #endif	// ZEN_WITH_COMPUTE_SERVICES
 
-		if (ServerOptions.StructuredCacheEnabled)
-		{
-			InitializeStructuredCache(ServerOptions);
-		}
-		else
-		{
-			ZEN_INFO("NOT instantiating structured cache service");
-		}
+		InitializeStructuredCache(ServerOptions);
+		
+		ZEN_INFO("instantiating project service");
+		m_ProjectStore = new zen::ProjectStore(*m_CidStore, *m_CacheStore, m_DataRoot / "projects", m_GcManager);
+		m_HttpProjectService.reset(new zen::HttpProjectService{*m_CidStore, m_ProjectStore});
 
 #if ZEN_ENABLE_MESH
 		if (ServerOptions.MeshEnabled)
-- 
cgit v1.2.3