[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/LOOLWSD.cpp

[Ashod Nakashian]

 loolwsd/LOOLWSD.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit bcc7f117a725733fd8e3e53650b0d44f1ebc3489
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu May 12 10:47:05 2016 -0400

    loolwsd: initialize logging sooner and log server startup
    
    Change-Id: I33ab52069be0b6c0dca5a741857aa86ae58b67cc
    Reviewed-on: https://gerrit.libreoffice.org/24934
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit 711b59a2bcd07eed2a56b9a1f6d18b7ef9709629)
    Reviewed-on: https://gerrit.libreoffice.org/25385

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index f2b47ad..eff2fea 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1160,6 +1160,8 @@ LOOLWSD::~LOOLWSD()
 
 void LOOLWSD::initialize(Application& self)
 {
+    Log::initialize("wsd");
+
     if (geteuid() == 0)
     {
         throw std::runtime_error("Do not run as root. Please run as lool user.");
@@ -1459,8 +1461,6 @@ Process::PID LOOLWSD::createForKit()
 
 int LOOLWSD::main(const std::vector<std::string>& /*args*/)
 {
-    Log::initialize("wsd");
-
     if (DisplayVersion)
         Util::displayVersionInfo("loolwsd");
 
@@ -1548,14 +1548,14 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
 #endif
     ThreadPool threadPool(NumPreSpawnedChildren*6, MAX_SESSIONS * 2);
     HTTPServer srv(new ClientRequestHandlerFactory(fileServer), threadPool, svs, params1);
-
+    Log::info("Starting master server listening on " + std::to_string(ClientPortNumber));
     srv.start();
 
     // And one on the port for child processes
     SocketAddress addr2("127.0.0.1", MasterPortNumber);
     ServerSocket svs2(addr2);
     HTTPServer srv2(new PrisonerRequestHandlerFactory(), threadPool, svs2, params2);
-
+    Log::info("Starting prisoner server listening on " + std::to_string(MasterPortNumber));
     srv2.start();
 
     // Fire the ForKit process; we are ready.