[Libreoffice-commits] online.git: loolwsd/DocumentBroker.cpp loolwsd/IoUtil.cpp

[Ashod Nakashian]

 loolwsd/DocumentBroker.cpp |    3 ++-
 loolwsd/IoUtil.cpp         |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6f39c0f282a0fc405bc1ebc66cbbdce2b2255912
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date:   Sat May 7 09:45:57 2016 -0400

    loolwsd: state the child PID which has no DocumentBroker
    
    Change-Id: Ifa679ac67cc0a1d12bba4a44f24831e7a291d97d
    Reviewed-on: https://gerrit.libreoffice.org/24739
    Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
    Tested-by: Ashod Nakashian <ashnak...@gmail.com>

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index d6e686a..4c8591a 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -32,7 +32,8 @@ void ChildProcess::socketProcessor()
                 return docBroker->handleInput(payload);
             }
 
-            Log::warn("No DocumentBroker to handle child message: [" + 
LOOLProtocol::getAbbreviatedMessage(payload) + "].");
+            Log::warn() << "Child " << this->_pid << " has no DocumentBroker 
to handle message: ["
+                        << LOOLProtocol::getAbbreviatedMessage(payload) << 
"]." << Log::end;
             return true;
         },
         []() { },
diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index da69754..abe1b71 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -75,7 +75,7 @@ void SocketProcessor(const std::shared_ptr<WebSocket>& ws,
     Log::info("SocketProcessor starting.");
 
     // Timeout given is in microseconds.
-    const Poco::Timespan waitTime(POLL_TIMEOUT_MS * 1000);
+    static const Poco::Timespan waitTime(POLL_TIMEOUT_MS * 1000);
     try
     {
         ws->setReceiveTimeout(0);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits