fix zenserver state macos (#669)

- Shared memory for zenserver state may hang around after all zenserver processes exit - make sure we find a valid entry in `zen up` before bailing
- Httpasio add retry for desired port
- Httpasio only call listen() once
- Httpasio explicitly close acceptor sockets

1 files changed, 24 insertions, 5 deletions

diff --git a/src/zenhttp/servers/httpasio.cpp b/src/zenhttp/servers/httpasio.cpp
index c75057733..7ef0437c3 100644
--- a/src/zenhttp/servers/httpasio.cpp
+++ b/src/zenhttp/servers/httpasio.cpp
@@ -613,6 +613,13 @@ struct HttpAcceptor
 			m_Acceptor.set_option(asio::ip::v6_only(true));
 			m_Acceptor.bind(asio::ip::tcp::endpoint(BindAddress, EffectivePort), BindErrorCode);
 		}
+		if (BindErrorCode == asio::error::address_in_use)
+		{
+			// Do a retry after a short sleep on same port just to be sure
+			ZEN_INFO("Desired port %d is in use, retrying", BasePort);
+			Sleep(100);
+			m_Acceptor.bind(asio::ip::tcp::endpoint(BindAddress, EffectivePort), BindErrorCode);
+		}
 		// Sharing violation implies the port is being used by another process
 		for (uint16_t PortOffset = 1; (BindErrorCode == asio::error::address_in_use) && (PortOffset < 10); ++PortOffset)
 		{
@@ -632,7 +639,9 @@ struct HttpAcceptor
 		{
 			m_AlternateProtocolAcceptor.bind(asio::ip::tcp::endpoint(asio::ip::address_v4::loopback(), EffectivePort), BindErrorCode);
 			m_UseAlternateProtocolAcceptor = true;
-			ZEN_INFO("Registered local-only handler 'http://{}:{}/' - this is not accessible from remote hosts", "[::1]", EffectivePort);
+			ZEN_INFO("Registered local-only handler 'http://{}:{}/' - this is not accessible from remote hosts",
+					 "localhost",
+					 EffectivePort);
 		}
 
 #if ZEN_PLATFORM_WINDOWS
@@ -675,18 +684,26 @@ struct HttpAcceptor
 		ZEN_INFO("Started asio server at 'http://{}:{}'", BindAddress.is_loopback() ? "[::1]" : "*", EffectivePort);
 	}
 
+	~HttpAcceptor()
+	{
+		m_Acceptor.close();
+		if (m_UseAlternateProtocolAcceptor)
+		{
+			m_AlternateProtocolAcceptor.close();
+		}
+	}
+
 	void Start()
 	{
-		m_Acceptor.listen();
+		ZEN_ASSERT(!m_IsStopped);
 		InitAcceptInternal(m_Acceptor);
 		if (m_UseAlternateProtocolAcceptor)
 		{
-			m_AlternateProtocolAcceptor.listen();
 			InitAcceptInternal(m_AlternateProtocolAcceptor);
 		}
 	}
 
-	void Stop() { m_IsStopped = true; }
+	void StopAccepting() { m_IsStopped = true; }
 
 	int GetAcceptPort() { return m_Acceptor.local_endpoint().port(); }
 
@@ -927,7 +944,7 @@ HttpAsioServerImpl::Stop()
 {
 	if (m_Acceptor)
 	{
-		m_Acceptor->Stop();
+		m_Acceptor->StopAccepting();
 	}
 	m_IoService.stop();
 	for (auto& Thread : m_ThreadPool)
@@ -937,6 +954,8 @@ HttpAsioServerImpl::Stop()
 			Thread.join();
 		}
 	}
+	m_ThreadPool.clear();
+	m_Acceptor.reset();
 }
 
 void