Changed naming scheme for lifecycle events. Always create shutdown events (not just in test scenarios)

2 files changed, 5 insertions, 5 deletions

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 573145d0d..56b6c793f 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -299,6 +299,10 @@ main(int argc, char* argv[])
 		std::unique_ptr<std::thread>	 ShutdownThread;
 		std::unique_ptr<zen::NamedEvent> ShutdownEvent;
 
+		zen::ExtendableStringBuilder<64> ShutdownEventName;
+		ShutdownEventName << "Zen_" << GlobalOptions.BasePort << "_Shutdown";
+		ShutdownEvent.reset(new zen::NamedEvent{ShutdownEventName});
+
 		ZenServer Server;
 		Server.SetDataRoot(GlobalOptions.DataDir);
 		Server.SetTestMode(GlobalOptions.IsTest);
@@ -309,10 +313,6 @@ main(int argc, char* argv[])
 
 		if (!GlobalOptions.ChildId.empty())
 		{
-			zen::ExtendableStringBuilder<64> ShutdownEventName;
-			ShutdownEventName << GlobalOptions.ChildId << "_Shutdown";
-			ShutdownEvent.reset(new zen::NamedEvent{ShutdownEventName});
-
 			zen::NamedEvent ParentEvent{GlobalOptions.ChildId};
 			ParentEvent.Set();
 
diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp
index 2a6b583de..73b8d01f1 100644
--- a/zenutil/zenserverprocess.cpp
+++ b/zenutil/zenserverprocess.cpp
@@ -362,7 +362,7 @@ ZenServerInstance::SpawnServer(int BasePort)
 	zen::NamedEvent ChildEvent{ChildEventName};
 
 	zen::ExtendableStringBuilder<32> ChildShutdownEventName;
-	ChildShutdownEventName << "Zen_Child_" << ChildId;
+	ChildShutdownEventName << "Zen_" << BasePort;
 	ChildShutdownEventName << "_Shutdown";
 	zen::NamedEvent ChildShutdownEvent{ChildShutdownEventName};