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

[Ashod Nakashian]

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

New commits:
commit 61488cce78baa188e7f53bad352b1d80dcd7be7a
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Fri Nov 4 00:13:47 2016 -0400

    loolwsd: move child communication logging
    
    ...and simplify the message (new line not needed).
    
    Change-Id: Ic304d39e444b13c140e16dbe232c2cb03659ff99
    Reviewed-on: https://gerrit.libreoffice.org/30551
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index d19bfdd..cbca3cd 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -469,14 +469,13 @@ std::string DocumentBroker::getJailRoot() const
 size_t DocumentBroker::addSession(std::shared_ptr<ClientSession>& session)
 {
     const auto id = session->getId();
-    const std::string aMessage = "session " + id + " " + _docKey + "\n";
+    const std::string aMessage = "session " + id + " " + _docKey;
 
     try
     {
         std::lock_guard<std::mutex> lock(_mutex);
 
         // Request a new session from the child kit.
-        Log::debug("DocBroker to Child: " + aMessage.substr(0, aMessage.length() - 1));
         _childProcess->sendTextFrame(aMessage);
 
         auto ret = _sessions.emplace(id, session);
@@ -840,7 +839,6 @@ bool DocumentBroker::forwardToChild(const std::string& viewId, const std::string
     if (it != _sessions.end())
     {
         const auto msg = "child-" + viewId + ' ' + message;
-        Log::debug("DocBroker to Child: " + msg);
         _childProcess->sendTextFrame(msg);
         return true;
     }
diff --git a/loolwsd/DocumentBroker.hpp b/loolwsd/DocumentBroker.hpp
index c1d0936..17de968 100644
--- a/loolwsd/DocumentBroker.hpp
+++ b/loolwsd/DocumentBroker.hpp
@@ -108,6 +108,7 @@ public:
     {
         try
         {
+            LOG_TRC("DocBroker to Child: " << data);
             _ws->sendFrame(data.data(), data.size());
             return true;
         }