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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Sun Jan 1 03:57:05 UTC 2017


 wsd/DocumentBroker.cpp |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 1a902736724f541dc6fec0a6295020bfa5f63aad
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Wed Dec 21 21:07:18 2016 -0500

    wsd: log child-to-wsd messages once
    
    Change-Id: I723f673998622416a8aa1f0f46928f530ceb252e
    Reviewed-on: https://gerrit.libreoffice.org/32553
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 9901ff5..edfcb42 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -45,9 +45,6 @@ void ChildProcess::socketProcessor()
     IoUtil::SocketProcessor(_ws, name,
         [this](const std::vector<char>& payload)
         {
-            const auto message = LOOLProtocol::getAbbreviatedMessage(payload);
-            LOG_TRC("Recv from child [" << message << "].");
-
             if (UnitWSD::get().filterChildMessage(payload))
             {
                 return true;
@@ -63,7 +60,8 @@ void ChildProcess::socketProcessor()
             }
 
             LOG_WRN("Child " << this->_pid <<
-                    " has no DocumentBroker to handle message: [" << message << "].");
+                    " has no DocumentBroker to handle message: [" <<
+                    LOOLProtocol::getAbbreviatedMessage(payload) << "].");
             return true;
         },
         []() { },
@@ -687,7 +685,7 @@ void DocumentBroker::alertAllUsers(const std::string& msg)
 bool DocumentBroker::handleInput(const std::vector<char>& payload)
 {
     const auto msg = LOOLProtocol::getAbbreviatedMessage(payload);
-    LOG_TRC("DocumentBroker got child message: [" << msg << "].");
+    LOG_TRC("DocumentBroker handling child message: [" << msg << "].");
 
     LOOLWSD::dumpOutgoingTrace(getJailId(), "0", msg);
 


More information about the Libreoffice-commits mailing list