[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Michael Meeks]

 wsd/LOOLWSD.cpp |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit ca24df225ef1d6cf4a609137989f04c3e954cfb9
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Mar 31 15:42:45 2017 +0100

    Prefork children correctly on start, rather than after a delay.

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 325d42b1..e51bf921 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2400,6 +2400,9 @@ int LOOLWSD::innerMain()
     }
 #endif
 
+    // Prefork initial children
+    prespawnChildren();
+
     // Start the server.
     srv.start(ClientPortNumber);
 
@@ -2464,6 +2467,7 @@ int LOOLWSD::innerMain()
 
 #ifndef KIT_IN_PROCESS
     // Wait for forkit process finish.
+    LOG_INF("Waiting for forkit process to exit");
     int status = 0;
     waitpid(ForKitProcId, &status, WUNTRACED);
     close(ForKitWritePipe);