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

[Ashod Nakashian]

 loolwsd/LOOLBroker.cpp |    1 +
 loolwsd/LOOLWSD.cpp    |   10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit f3b319ee7f847d21472e6914b189ed8d509efd81
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Feb 1 20:47:40 2016 -0500

    loolwsd: each HTTPServer has its params and skip failed child query
    
    Change-Id: I41c730a935fd0d2e1e3181cced529d414c3aebb0
    Reviewed-on: https://gerrit.libreoffice.org/22014
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index cb93536..24e8d94 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -379,6 +379,7 @@ public:
                 }
 
                 log << Log::end;
+                ++it;
                 continue;
             }
 
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 2e59e0e..e13438e 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -963,20 +963,22 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
     // We must have sufficient available threads
     // in the default ThreadPool to dispatch
     // connections, otherwise we will deadlock.
-    auto params = new HTTPServerParams();
-    params->setMaxThreads(MAX_SESSIONS);
+    auto params1 = new HTTPServerParams();
+    params1->setMaxThreads(MAX_SESSIONS);
+    auto params2 = new HTTPServerParams();
+    params2->setMaxThreads(MAX_SESSIONS);
 
     // Start a server listening on the port for clients
     ServerSocket svs(ClientPortNumber);
     ThreadPool threadPool(NumPreSpawnedChildren*6, MAX_SESSIONS * 2);
-    HTTPServer srv(new RequestHandlerFactory<ClientRequestHandler>(), threadPool, svs, params);
+    HTTPServer srv(new RequestHandlerFactory<ClientRequestHandler>(), threadPool, svs, params1);
 
     srv.start();
 
     // And one on the port for child processes
     SocketAddress addr2("127.0.0.1", MASTER_PORT_NUMBER);
     ServerSocket svs2(addr2);
-    HTTPServer srv2(new RequestHandlerFactory<PrisonerRequestHandler>(), threadPool, svs2, params);
+    HTTPServer srv2(new RequestHandlerFactory<PrisonerRequestHandler>(), threadPool, svs2, params2);
 
     srv2.start();