diff options
| author | Liam Mitchell <[email protected]> | 2026-02-04 14:45:08 -0800 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2026-02-04 14:45:08 -0800 |
| commit | 04697c9f880fddf4ba288bde9e159f2839651b27 (patch) | |
| tree | 929e505df185c8c7171942b0c2588401f8c57346 /src/zenhttp/servers/httpmulti.cpp | |
| parent | 5.7.20-pre1 (diff) | |
| parent | Revert "Run Windows service as an interactive session, so we correctly respon... (diff) | |
| download | zen-04697c9f880fddf4ba288bde9e159f2839651b27.tar.xz zen-04697c9f880fddf4ba288bde9e159f2839651b27.zip | |
Merge pull request #723 from ue-foundation/lm/service-interactive-session
Run Windows service as an interactive session, so we correctly respond to RequestApplicationExit when requested to stop by the service manager
Diffstat (limited to 'src/zenhttp/servers/httpmulti.cpp')
| -rw-r--r-- | src/zenhttp/servers/httpmulti.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/zenhttp/servers/httpmulti.cpp b/src/zenhttp/servers/httpmulti.cpp index 6541a1c48..31cb04be5 100644 --- a/src/zenhttp/servers/httpmulti.cpp +++ b/src/zenhttp/servers/httpmulti.cpp @@ -56,23 +56,17 @@ HttpMultiServer::OnInitialize(int BasePort, std::filesystem::path DataDir) void HttpMultiServer::OnRun(bool IsInteractiveSession) { - const bool TestMode = !IsInteractiveSession; - - int WaitTimeout = -1; - if (!TestMode) - { - WaitTimeout = 1000; - } + const int WaitTimeout = 1000; #if ZEN_PLATFORM_WINDOWS - if (TestMode == false) + if (IsInteractiveSession) { ZEN_CONSOLE("Zen Server running (multi server). Press ESC or Q to quit"); } do { - if (!TestMode && _kbhit() != 0) + if (IsInteractiveSession && _kbhit() != 0) { char c = (char)_getch(); @@ -85,7 +79,7 @@ HttpMultiServer::OnRun(bool IsInteractiveSession) m_ShutdownEvent.Wait(WaitTimeout); } while (!IsApplicationExitRequested()); #else - if (TestMode == false) + if (IsInteractiveSession) { ZEN_CONSOLE("Zen Server running (null HTTP). Ctrl-C to quit"); } |