From d02b0720813a62a4f1fe875e6e784843f5c2da46 Mon Sep 17 00:00:00 2001
From: Dan Engelbrecht <dan@engelbrecht.com>
Date: Wed, 15 Nov 2023 11:30:56 +0100
Subject: fix race contdition when signaling shutdown of process and waiting
 for completion (#539)

---
 src/zenutil/zenserverprocess.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/zenutil/zenserverprocess.cpp')

diff --git a/src/zenutil/zenserverprocess.cpp b/src/zenutil/zenserverprocess.cpp
index 83c6668ba..00736321c 100644
--- a/src/zenutil/zenserverprocess.cpp
+++ b/src/zenutil/zenserverprocess.cpp
@@ -468,7 +468,14 @@ ZenServerInstance::ZenServerInstance(ZenServerEnvironment& TestEnvironment) : m_
 
 ZenServerInstance::~ZenServerInstance()
 {
-	Shutdown();
+	try
+	{
+		Shutdown();
+	}
+	catch (const std::exception& Err)
+	{
+		ZEN_ERROR("Shutting down zenserver instance failed, reason: '{}'", Err.what());
+	}
 }
 
 void
@@ -491,6 +498,7 @@ ZenServerInstance::Shutdown()
 		else
 		{
 			SignalShutdown();
+			ZEN_DEBUG("Waiting for zenserver process {} to shut down", m_Process.Pid());
 			m_Process.Wait();
 			m_Process.Reset();
 		}
-- 
cgit v1.2.3