From 3d59b5d7036c35fe484d052ff32dbdc9d0a75cf7 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Mon, 13 Apr 2026 19:17:09 +0200 Subject: fix utf characters in source code (#953) --- src/zenserver/proxy/zenproxyserver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/zenserver/proxy/zenproxyserver.cpp') diff --git a/src/zenserver/proxy/zenproxyserver.cpp b/src/zenserver/proxy/zenproxyserver.cpp index 7e59a7b7e..4d4486cbb 100644 --- a/src/zenserver/proxy/zenproxyserver.cpp +++ b/src/zenserver/proxy/zenproxyserver.cpp @@ -257,7 +257,7 @@ ZenProxyServerConfigurator::ValidateOptions() for (const std::string& Raw : m_RawProxyMappings) { // The mode keyword "proxy" from argv[1] gets captured as a positional - // argument — skip it. + // argument - skip it. if (Raw == "proxy") { continue; @@ -304,7 +304,7 @@ ZenProxyServer::Initialize(const ZenProxyServerConfig& ServerConfig, ZenServerSt // worker threads don't exit prematurely between async operations. m_ProxyIoWorkGuard.emplace(m_ProxyIoContext.get_executor()); - // Start proxy I/O worker threads. Use a modest thread count — proxy work is + // Start proxy I/O worker threads. Use a modest thread count - proxy work is // I/O-bound so we don't need a thread per core, but having more than one // avoids head-of-line blocking when many connections are active. unsigned int ThreadCount = std::max(GetHardwareConcurrency() / 4, 4u); -- cgit v1.2.3 From 5a48e941b6f7e41ff6f0e86e6999f8b0a15d5c5b Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Wed, 15 Apr 2026 19:12:44 +0200 Subject: add sessions to hub and proxy (#960) * move session service to zenserver base class and make it available in all zenserver modes * fix deadlock in sessionsclient shutdown --- src/zenserver/proxy/zenproxyserver.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/zenserver/proxy/zenproxyserver.cpp') diff --git a/src/zenserver/proxy/zenproxyserver.cpp b/src/zenserver/proxy/zenproxyserver.cpp index 4d4486cbb..ffa9a4295 100644 --- a/src/zenserver/proxy/zenproxyserver.cpp +++ b/src/zenserver/proxy/zenproxyserver.cpp @@ -385,6 +385,8 @@ ZenProxyServer::Run() OnReady(); + StartSelfSession("zenproxy"); + m_Http->Run(IsInteractiveMode); SetNewState(kShuttingDown); @@ -422,15 +424,16 @@ ZenProxyServer::Cleanup() m_IoRunner.join(); } - m_ProxyStatsService.reset(); - m_FrontendService.reset(); - m_ApiService.reset(); - - ShutdownServices(); if (m_Http) { m_Http->Close(); } + + ShutdownServices(); + + m_ProxyStatsService.reset(); + m_FrontendService.reset(); + m_ApiService.reset(); } catch (const std::exception& Ex) { -- cgit v1.2.3