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 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'zenserver/zenserver.cpp') 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(); -- cgit v1.2.3