Merge branch 'main' into 273-integrated-memory-tracking273-integrated-memory-tracking

1 files changed, 44 insertions, 8 deletions

diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 336f715f4..f80f95f8e 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -305,7 +305,8 @@ ZenServer::Initialize(const ZenServerOptions& ServerOptions, ZenServerState::Zen
 										   m_ProjectStore,
 										   HttpAdminService::LogPaths{.AbsLogPath	= ServerOptions.AbsLogFile,
 																	  .HttpLogPath	= ServerOptions.DataDir / "logs" / "http.log",
-																	  .CacheLogPath = ServerOptions.DataDir / "logs" / "z$.log"});
+																	  .CacheLogPath = ServerOptions.DataDir / "logs" / "z$.log"},
+										   ServerOptions);
 	m_Http->RegisterService(*m_AdminService);
 
 	return EffectiveBasePort;
@@ -329,6 +330,8 @@ ZenServer::InitializeState(const ZenServerOptions& ServerOptions)
 
 	bool				  UpdateManifest = false;
 	std::filesystem::path ManifestPath	 = m_DataRoot / "root_manifest";
+	Oid					  StateId		 = Oid::Zero;
+	DateTime			  CreatedWhen{0};
 
 	if (!WipeState)
 	{
@@ -365,6 +368,8 @@ ZenServer::InitializeState(const ZenServerOptions& ServerOptions)
 				m_RootManifest = LoadCompactBinaryObject(Manifest);
 
 				const int32_t ManifestVersion = m_RootManifest["schema_version"].AsInt32(0);
+				StateId						  = m_RootManifest["state_id"].AsObjectId();
+				CreatedWhen					  = m_RootManifest["created"].AsDateTime();
 
 				if (ManifestVersion != ZEN_CFG_SCHEMA_VERSION)
 				{
@@ -391,6 +396,20 @@ ZenServer::InitializeState(const ZenServerOptions& ServerOptions)
 		}
 	}
 
+	if (StateId == Oid::Zero)
+	{
+		StateId		   = Oid::NewOid();
+		UpdateManifest = true;
+	}
+
+	const DateTime Now = DateTime::Now();
+
+	if (CreatedWhen.GetTicks() == 0)
+	{
+		CreatedWhen	   = Now;
+		UpdateManifest = true;
+	}
+
 	// Handle any state wipe
 
 	if (WipeState)
@@ -418,19 +437,36 @@ ZenServer::InitializeState(const ZenServerOptions& ServerOptions)
 		UpdateManifest = true;
 	}
 
-	if (UpdateManifest)
-	{
-		// Write new manifest
-
-		const DateTime Now = DateTime::Now();
+	// Write manifest
 
+	{
 		CbObjectWriter Cbo;
-		Cbo << "schema_version" << ZEN_CFG_SCHEMA_VERSION << "created" << Now << "updated" << Now << "state_id" << Oid::NewOid();
+		Cbo << "schema_version" << ZEN_CFG_SCHEMA_VERSION << "created" << CreatedWhen << "updated" << Now << "state_id" << StateId;
 
 		m_RootManifest = Cbo.Save();
 
-		WriteFile(ManifestPath, m_RootManifest.GetBuffer().AsIoBuffer());
+		if (UpdateManifest)
+		{
+			IoBuffer ManifestBuffer = m_RootManifest.GetBuffer().AsIoBuffer();
+
+			WriteFile(ManifestPath, ManifestBuffer);
+		}
+
+		if (!ServerOptions.IsTest)
+		{
+			try
+			{
+				EmitCentralManifest(ServerOptions.SystemRootDir, StateId, m_RootManifest, ManifestPath);
+			}
+			catch (const std::exception& Ex)
+			{
+				ZEN_WARN("Unable to emit central manifest: ", Ex.what());
+			}
+		}
 	}
+
+	// Write state marker
+
 	{
 		std::filesystem::path		  StateMarkerPath	 = m_DataRoot / "state_marker";
 		static const std::string_view StateMarkerContent = "deleting this file will cause " ZEN_APP_NAME " to exit"sv;