1 files changed, 21 insertions, 13 deletions

diff --git a/src/zenserver/storage/zenstorageserver.h b/src/zenserver/storage/zenstorageserver.h
index 456447a2a..9fa46ba9b 100644
--- a/src/zenserver/storage/zenstorageserver.h
+++ b/src/zenserver/storage/zenstorageserver.h
@@ -11,6 +11,7 @@
 #include <zenstore/cache/structuredcachestore.h>
 #include <zenstore/gc.h>
 #include <zenstore/projectstore.h>
+#include "localrefpolicy.h"
 
 #include "admin/admin.h"
 #include "buildstore/httpbuildstore.h"
@@ -24,8 +25,10 @@
 #include "vfs/vfsservice.h"
 #include "workspaces/httpworkspaces.h"
 
+#include <zenutil/sessionsclient.h>
+
 #if ZEN_WITH_COMPUTE_SERVICES
-#	include <zencompute/httpfunctionservice.h>
+#	include <zencompute/httpcomputeservice.h>
 #endif
 
 namespace zen {
@@ -62,22 +65,22 @@ private:
 	void InitializeServices(const ZenStorageServerConfig& ServerOptions);
 	void RegisterServices();
 
-	HttpStatsService				  m_StatsService;
-	std::unique_ptr<JobQueue>		  m_JobQueue;
-	GcManager						  m_GcManager;
-	GcScheduler						  m_GcScheduler{m_GcManager};
-	std::unique_ptr<CidStore>		  m_CidStore;
-	Ref<ZenCacheStore>				  m_CacheStore;
-	std::unique_ptr<OpenProcessCache> m_OpenProcessCache;
-	HttpTestService					  m_TestService;
-	std::unique_ptr<CidStore>		  m_BuildCidStore;
-	std::unique_ptr<BuildStore>		  m_BuildStore;
+	std::unique_ptr<DataRootLocalRefPolicy> m_LocalRefPolicy;
+	std::unique_ptr<JobQueue>				m_JobQueue;
+	GcManager								m_GcManager;
+	GcScheduler								m_GcScheduler{m_GcManager};
+	std::unique_ptr<CidStore>				m_CidStore;
+	Ref<ZenCacheStore>						m_CacheStore;
+	std::unique_ptr<OpenProcessCache>		m_OpenProcessCache;
+	HttpTestService							m_TestService;
+	std::unique_ptr<CidStore>				m_BuildCidStore;
+	std::unique_ptr<BuildStore>				m_BuildStore;
 
 #if ZEN_WITH_TESTS
 	HttpTestingService m_TestingService;
 #endif
 
-	RefPtr<ProjectStore>						m_ProjectStore;
+	Ref<ProjectStore>							m_ProjectStore;
 	std::unique_ptr<VfsServiceImpl>				m_VfsServiceImpl;
 	std::unique_ptr<HttpProjectService>			m_HttpProjectService;
 	std::unique_ptr<Workspaces>					m_Workspaces;
@@ -92,8 +95,13 @@ private:
 	std::unique_ptr<HttpAdminService>			m_AdminService;
 	std::unique_ptr<HttpApiService>				m_ApiService;
 
+	std::unique_ptr<SessionsServiceClient> m_SessionsClient;
+	logging::SinkPtr					   m_SessionLogSink;
+	asio::steady_timer					   m_SessionAnnounceTimer{m_IoContext};
+	void								   EnqueueSessionAnnounceTimer();
+
 #if ZEN_WITH_COMPUTE_SERVICES
-	std::unique_ptr<compute::HttpFunctionService> m_HttpFunctionService;
+	std::unique_ptr<compute::HttpComputeService> m_HttpComputeService;
 #endif
 };