From a7ee7fa8ed2ff71913835bdc1913e0b572eca7c7 Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Mon, 9 Aug 2021 16:54:57 +0200 Subject: Changed naming scheme for lifecycle events. Always create shutdown events (not just in test scenarios) --- zenserver/zenserver.cpp | 8 ++++---- zenutil/zenserverprocess.cpp | 2 +- 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 ShutdownThread; std::unique_ptr 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}; -- cgit v1.2.3