[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp loolwsd/loolwsd.xml.in

[Tor Lillqvist]

 loolwsd/LOOLWSD.cpp    |    4 ++--
 loolwsd/loolwsd.xml.in |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 996898f9cef4aa3c2d9e0c30701344ca89a93c83
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Apr 18 09:50:24 2016 +0300

    The default number of preforked loolkit processes is actually just one
    
    At least, that is the value of the num_prespawn_children element in
    the loolwsd.xml as shipped. But maybe that is not what is meant with
    "default"? It is unclear to me what the "default" attribute means.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 8bda983..648ac7d 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1132,8 +1132,8 @@ void LOOLWSD::initialize(Application& self)
 
     if (NumPreSpawnedChildren == 0)
     {
-        // Default to 10 children.
-        NumPreSpawnedChildren = config().getUInt("num_prespawn_children", 10);
+        // Default to 1 child.
+        NumPreSpawnedChildren = config().getUInt("num_prespawn_children", 1);
     }
 
     StorageBase::initialize();
diff --git a/loolwsd/loolwsd.xml.in b/loolwsd/loolwsd.xml.in
index e944569..da2f02b 100644
--- a/loolwsd/loolwsd.xml.in
+++ b/loolwsd/loolwsd.xml.in
@@ -9,7 +9,7 @@
     <server_name desc="Hostname:port of the server running loolwsd. If empty, it's derived from the request." type="string" default=""></server_name>
     <file_server_root_path desc="Path to the directory that should be considered root for the file server. This should be the directory containing loleaflet." type="path" relative="true" default="../loleaflet/../"></file_server_root_path>
 
-    <num_prespawn_children desc="Number of child processes to keep started in advance and waiting for new clients." type="uint" default="10">1</num_prespawn_children>
+    <num_prespawn_children desc="Number of child processes to keep started in advance and waiting for new clients." type="uint" default="1">1</num_prespawn_children>
 
     <logging>
         <color type="bool">true</color>