hubservice refactor (#819)

* move Hub to separate class
* move StorageServerInstance to separate files
* refactor HttpHubService to not own Hub instance

1 files changed, 13 insertions, 3 deletions

diff --git a/src/zenserver/hub/zenhubserver.cpp b/src/zenserver/hub/zenhubserver.cpp
index c6d2dc8d4..64ab0bd9e 100644
--- a/src/zenserver/hub/zenhubserver.cpp
+++ b/src/zenserver/hub/zenhubserver.cpp
@@ -1,6 +1,9 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
 #include "zenhubserver.h"
+
+#include "frontend/frontend.h"
+#include "hub.h"
 #include "hubservice.h"
 
 #include <zencore/fmtutils.h>
@@ -9,7 +12,6 @@
 #include <zencore/memory/tagtrace.h>
 #include <zencore/scopeguard.h>
 #include <zencore/sentryintegration.h>
-#include <zencore/system.h>
 #include <zencore/windows.h>
 #include <zenhttp/httpapiservice.h>
 #include <zenutil/service.h>
@@ -116,11 +118,15 @@ ZenHubServer::Cleanup()
 		}
 
 		ShutdownServices();
-
 		if (m_Http)
 		{
 			m_Http->Close();
 		}
+
+		m_FrontendService.reset();
+		m_HubService.reset();
+		m_ApiService.reset();
+		m_Hub.reset();
 	}
 	catch (const std::exception& Ex)
 	{
@@ -139,11 +145,15 @@ ZenHubServer::InitializeServices(const ZenHubServerConfig& ServerConfig)
 {
 	ZEN_UNUSED(ServerConfig);
 
+	ZEN_INFO("instantiating Hub");
+	m_Hub = std::make_unique<Hub>(
+		Hub::Configuration{.HubBaseDir = ServerConfig.DataDir / "hub", .ChildBaseDir = ServerConfig.DataDir / "servers"});
+
 	ZEN_INFO("instantiating API service");
 	m_ApiService = std::make_unique<zen::HttpApiService>(*m_Http);
 
 	ZEN_INFO("instantiating hub service");
-	m_HubService = std::make_unique<HttpHubService>(ServerConfig.DataDir / "hub", ServerConfig.DataDir / "servers");
+	m_HubService = std::make_unique<HttpHubService>(*m_Hub);
 	m_HubService->SetNotificationEndpoint(ServerConfig.UpstreamNotificationEndpoint, ServerConfig.InstanceId);
 
 	m_FrontendService = std::make_unique<HttpFrontendService>(m_ContentRoot, m_StatusService);