restructured zenserver configuration (#575)

this breaks out the configuration logic to allow multiple applications to share common configuration and initialization logic whilst customizing chosen aspects of the process

1 files changed, 8 insertions, 9 deletions

diff --git a/src/zenserver/storage/zenstorageserver.cpp b/src/zenserver/storage/zenstorageserver.cpp
index 73896512d..65de3eca2 100644
--- a/src/zenserver/storage/zenstorageserver.cpp
+++ b/src/zenserver/storage/zenstorageserver.cpp
@@ -100,10 +100,11 @@ ZenStorageServer::ZenStorageServer()
 
 ZenStorageServer::~ZenStorageServer()
 {
+	Cleanup();
 }
 
 int
-ZenStorageServer::Initialize(const ZenStorageServerOptions& ServerOptions, ZenServerState::ZenServerEntry* ServerEntry)
+ZenStorageServer::Initialize(const ZenStorageServerConfig& ServerOptions, ZenServerState::ZenServerEntry* ServerEntry)
 {
 	ZEN_TRACE_CPU("ZenStorageServer::Initialize");
 	ZEN_MEMSCOPE(GetZenserverTag());
@@ -182,7 +183,7 @@ ZenStorageServer::RegisterServices()
 }
 
 void
-ZenStorageServer::InitializeServices(const ZenStorageServerOptions& ServerOptions)
+ZenStorageServer::InitializeServices(const ZenStorageServerConfig& ServerOptions)
 {
 	InitializeAuthentication(ServerOptions);
 
@@ -300,7 +301,7 @@ ZenStorageServer::InitializeServices(const ZenStorageServerOptions& ServerOption
 }
 
 void
-ZenStorageServer::InitializeAuthentication(const ZenStorageServerOptions& ServerOptions)
+ZenStorageServer::InitializeAuthentication(const ZenStorageServerConfig& ServerOptions)
 {
 	// Setup authentication manager
 	{
@@ -343,7 +344,7 @@ ZenStorageServer::InitializeAuthentication(const ZenStorageServerOptions& Server
 }
 
 void
-ZenStorageServer::InitializeState(const ZenStorageServerOptions& ServerOptions)
+ZenStorageServer::InitializeState(const ZenStorageServerConfig& ServerOptions)
 {
 	ZEN_TRACE_CPU("ZenStorageServer::InitializeState");
 
@@ -507,7 +508,7 @@ ZenStorageServer::InitializeState(const ZenStorageServerOptions& ServerOptions)
 }
 
 void
-ZenStorageServer::InitializeStructuredCache(const ZenStorageServerOptions& ServerOptions)
+ZenStorageServer::InitializeStructuredCache(const ZenStorageServerConfig& ServerOptions)
 {
 	ZEN_TRACE_CPU("ZenStorageServer::InitializeStructuredCache");
 
@@ -876,7 +877,7 @@ ZenStorageServer::Flush()
 
 //////////////////////////////////////////////////////////////////////////
 
-ZenStorageServerMain::ZenStorageServerMain(ZenStorageServerOptions& ServerOptions)
+ZenStorageServerMain::ZenStorageServerMain(ZenStorageServerConfig& ServerOptions)
 : ZenServerMain(ServerOptions)
 , m_ServerOptions(ServerOptions)
 {
@@ -891,8 +892,6 @@ ZenStorageServerMain::DoRun(ZenServerState::ZenServerEntry* Entry)
 	Server.SetTestMode(m_ServerOptions.IsTest);
 	Server.SetDedicatedMode(m_ServerOptions.IsDedicated);
 
-	auto ServerCleanup = MakeGuard([&Server] { Server.Cleanup(); });
-
 	int EffectiveBasePort = Server.Initialize(m_ServerOptions, Entry);
 	if (EffectiveBasePort == -1)
 	{
@@ -917,7 +916,7 @@ ZenStorageServerMain::DoRun(ZenServerState::ZenServerEntry* Entry)
 	// Monitor shutdown signals
 
 	ShutdownThread.reset(new std::thread{[&] {
-		SetCurrentThreadName("shutdown_monitor");
+		SetCurrentThreadName("shutdown_mon");
 
 		ZEN_INFO("shutdown monitor thread waiting for shutdown signal '{}' for process {}", ShutdownEventName, zen::GetCurrentProcessId());