Merged from origin/main

1 files changed, 7 insertions, 3 deletions

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 934fd95bc..e57a6142d 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -10,6 +10,7 @@
 #include <zencore/timer.h>
 #include <zencore/windows.h>
 #include <zenstore/cas.h>
+#include <zenstore/cidstore.h>
 
 #include <fmt/format.h>
 #include <mimalloc-new-delete.h>
@@ -76,18 +77,20 @@ public:
 		// Ok so now we're configured, let's kick things off
 
 		zen::CasStoreConfiguration Config;
-		Config.RootDirectory = m_DataRoot / "CAS";
+		Config.RootDirectory = m_DataRoot / "cas";
 
 		m_CasStore->Initialize(Config);
 
 		spdlog::info("instantiating project service");
 
-		m_ProjectStore = new zen::ProjectStore(*m_CasStore, m_DataRoot / "Builds");
+		m_ProjectStore = new zen::ProjectStore(*m_CasStore, m_DataRoot / "projects");
 		m_HttpProjectService.reset(new zen::HttpProjectService{*m_CasStore, m_ProjectStore});
 		m_LocalProjectService = zen::LocalProjectService::New(*m_CasStore, m_ProjectStore);
 
 		m_HttpLaunchService = std::make_unique<zen::HttpLaunchService>(*m_CasStore);
 
+		m_CidStore = std::make_unique<zen::CidStore>(*m_CasStore, m_DataRoot / "cid");
+
 		if (ServiceConfig.LegacyCacheEnabled)
 		{
 			spdlog::info("instantiating legacy cache service");
@@ -101,7 +104,7 @@ public:
 		if (ServiceConfig.StructuredCacheEnabled)
 		{
 			spdlog::info("instantiating structured cache service");
-			m_StructuredCacheService.reset(new zen::HttpStructuredCacheService(m_DataRoot / "cache", *m_CasStore));
+			m_StructuredCacheService.reset(new zen::HttpStructuredCacheService(m_DataRoot / "cache", *m_CasStore, *m_CidStore));
 		}
 		else
 		{
@@ -207,6 +210,7 @@ private:
 
 	zen::HttpServer									 m_Http;
 	std::unique_ptr<zen::CasStore>					 m_CasStore{zen::CreateCasStore()};
+	std::unique_ptr<zen::CidStore>					 m_CidStore;
 	zen::CasGc										 m_Gc{*m_CasStore};
 	zen::CasScrubber								 m_Scrubber{*m_CasStore};
 	HttpTestService									 m_TestService;