Print local server output to console on disconnect/shutdown

Author: botder

Client/mods/deathmatch/logic/CServer.cpp

@@ -225,6 +225,13 @@ void CServer::Stop(bool graceful)
         }
     }
 
+    // Print out the remaining server output (but not everything to avoid blocking here).
+    for (int i = 0; i < 5; ++i)
+    {
+        if (!PrintServerOutputToConsole())
+            break;
+    }
+
     if (DWORD exitCode{}; GetExitCodeProcess(m_process, &exitCode))
     {
         const char* errorText = "Unknown exit code";
@@ -256,16 +263,7 @@ void CServer::Pulse()
     if (!m_isRunning)
         return;
 
-    // Try to read the process standard output and then write it to the console window.
-    if (DWORD numBytes{}; PeekNamedPipe(m_stdout, nullptr, 0, nullptr, &numBytes, nullptr) && numBytes > 0)
-    {
-        std::array<char, 4096> buffer{};
-
-        if (ReadFile(m_stdout, buffer.data(), std::min<DWORD>(buffer.size(), numBytes), &numBytes, nullptr) && numBytes > 0)
-        {
-            g_pCore->GetConsole()->Printf("%.*s", numBytes, buffer.data());
-        }
-    }
+    PrintServerOutputToConsole();
 
     // Check if the server process was terminated externally.
     if (!IsProcessRunning(m_process))
@@ -285,3 +283,20 @@ void CServer::Pulse()
         }
     }
 }
+
+bool CServer::PrintServerOutputToConsole()
+{
+    // Try to read the process standard output and then write it to the console window.
+    if (DWORD numBytes{}; PeekNamedPipe(m_stdout, nullptr, 0, nullptr, &numBytes, nullptr) && numBytes > 0)
+    {
+        std::array<char, 4096> buffer{};
+
+        if (ReadFile(m_stdout, buffer.data(), std::min<DWORD>(buffer.size(), numBytes), &numBytes, nullptr) && numBytes > 0)
+        {
+            g_pCore->GetConsole()->Printf("%.*s", numBytes, buffer.data());
+            return true;
+        }
+    }
+
+    return false;
+}

Client/mods/deathmatch/logic/CServer.h

@@ -30,6 +30,9 @@ class CServer final
 
     const std::string& GetPassword() const noexcept { return m_password; }
 
+public:
+    bool PrintServerOutputToConsole();
+
 private:
     bool        m_isRunning{};
     bool        m_isAcceptingConnections{};