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

[Ashod Nakashian]

 wsd/LOOLWSD.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e9e36ba848df4f8933867b2adf9960052c532c14
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Mar 25 21:53:17 2017 -0400

    wsd: reduce main poll timeout to recover child processes faster
    
    Change-Id: Ic5c43df9df7d50e101a8ed3c84ed12a113da1f2b
    Reviewed-on: https://gerrit.libreoffice.org/35711
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 7f4fd5bb..4bb13ffc 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2481,7 +2481,8 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
     {
         UnitWSD::get().invokeTest();
 
-        mainWait.poll(SocketPoll::DefaultPollTimeoutMs * 2);
+        // This timeout affects the recovery time of prespawned children.
+        mainWait.poll(SocketPoll::DefaultPollTimeoutMs);
 
         // Wake the prisoner poll to spawn some children, if necessary.
         PrisonerPoll.wakeup();