1 files changed, 16 insertions, 14 deletions

diff --git a/src/zenserver/storage/zenstorageserver.h b/src/zenserver/storage/zenstorageserver.h
index 5ccb587d6..d625f869c 100644
--- a/src/zenserver/storage/zenstorageserver.h
+++ b/src/zenserver/storage/zenstorageserver.h
@@ -6,11 +6,13 @@
 
 #include <zenhttp/auth/authmgr.h>
 #include <zenhttp/auth/authservice.h>
+#include <zenhttp/httpapiservice.h>
 #include <zenhttp/httptest.h>
 #include <zenstore/cache/structuredcachestore.h>
 #include <zenstore/gc.h>
 #include <zenstore/projectstore.h>
 
+#include "../sessions/httpsessions.h"
 #include "admin/admin.h"
 #include "buildstore/httpbuildstore.h"
 #include "cache/httpstructuredcache.h"
@@ -23,6 +25,10 @@
 #include "vfs/vfsservice.h"
 #include "workspaces/httpworkspaces.h"
 
+#if ZEN_WITH_COMPUTE_SERVICES
+#	include <zencompute/httpcomputeservice.h>
+#endif
+
 namespace zen {
 
 class ZenStorageServer : public ZenServerBase
@@ -34,11 +40,6 @@ public:
 	ZenStorageServer();
 	~ZenStorageServer();
 
-	void SetDedicatedMode(bool State) { m_IsDedicatedMode = State; }
-	void SetTestMode(bool State) { m_TestMode = State; }
-	void SetDataRoot(std::filesystem::path Root) { m_DataRoot = Root; }
-	void SetContentRoot(std::filesystem::path Root) { m_ContentRoot = Root; }
-
 	int	 Initialize(const ZenStorageServerConfig& ServerOptions, ZenServerState::ZenServerEntry* ServerEntry);
 	void Run();
 	void Cleanup();
@@ -48,14 +49,9 @@ private:
 	void InitializeStructuredCache(const ZenStorageServerConfig& ServerOptions);
 	void Flush();
 
-	bool				  m_IsDedicatedMode		   = false;
-	bool				  m_TestMode			   = false;
-	bool				  m_DebugOptionForcedCrash = false;
-	std::string			  m_StartupScrubOptions;
-	CbObject			  m_RootManifest;
-	std::filesystem::path m_DataRoot;
-	std::filesystem::path m_ContentRoot;
-	asio::steady_timer	  m_StateMarkerTimer{m_IoContext};
+	std::string		   m_StartupScrubOptions;
+	CbObject		   m_RootManifest;
+	asio::steady_timer m_StateMarkerTimer{m_IoContext};
 
 	void EnqueueStateMarkerTimer();
 	void CheckStateMarker();
@@ -67,7 +63,6 @@ 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};
@@ -87,6 +82,8 @@ private:
 	std::unique_ptr<HttpProjectService>			m_HttpProjectService;
 	std::unique_ptr<Workspaces>					m_Workspaces;
 	std::unique_ptr<HttpWorkspacesService>		m_HttpWorkspacesService;
+	std::unique_ptr<SessionsService>			m_SessionsService;
+	std::unique_ptr<HttpSessionsService>		m_HttpSessionsService;
 	std::unique_ptr<UpstreamCache>				m_UpstreamCache;
 	std::unique_ptr<HttpUpstreamService>		m_UpstreamService;
 	std::unique_ptr<HttpStructuredCacheService> m_StructuredCacheService;
@@ -95,6 +92,11 @@ private:
 	std::unique_ptr<HttpBuildStoreService>		m_BuildStoreService;
 	std::unique_ptr<VfsService>					m_VfsService;
 	std::unique_ptr<HttpAdminService>			m_AdminService;
+	std::unique_ptr<HttpApiService>				m_ApiService;
+
+#if ZEN_WITH_COMPUTE_SERVICES
+	std::unique_ptr<compute::HttpComputeService> m_HttpComputeService;
+#endif
 };
 
 struct ZenStorageServerConfigurator;