loolwsd/LOOLWSD.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 711b59a2bcd07eed2a56b9a1f6d18b7ef9709629
Author: Ashod Nakashian <ashod.nakash...@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 <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index bf8b674..c414c0f 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1161,6 +1161,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.");
@@ -1461,8 +1463,6 @@ Process::PID LOOLWSD::createForKit()
int LOOLWSD::main(const std::vector<std::string>& /*args*/)
{
- Log::initialize("wsd");
-
if (DisplayVersion)
Util::displayVersionInfo("loolwsd");
@@ -1550,14 +1550,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.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
