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

[Tor Lillqvist]

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

New commits:
commit fa0fd3303d5e530ad49c2bc58d0dc9b1d5b2e0b1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Mar 2 14:55:04 2016 +0200

    Avoid logging \r\n here, too

diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index ca9b088..126a12b 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -455,7 +455,7 @@ bool MasterProcessSession::loadDocument(const char* /*buffer*/, int /*length*/,
 
         // request new URL session
         const std::string aMessage = "request " + getId() + " " + _docURL + "\r\n";
-        Log::trace("MasterToBroker: " + aMessage);
+        Log::trace("MasterToBroker: " + aMessage.substr(0, aMessage.length()-2));
         Util::writeFIFO(LOOLWSD::BrokerWritePipe, aMessage);
     }
     catch (const Poco::SyntaxException&)
@@ -780,7 +780,7 @@ void MasterProcessSession::dispatchChild()
             Log::info() << "Retrying child permission... " << nRequest << Log::end;
             // request again new URL session
             const std::string aMessage = "request " + getId() + " " + _docURL + "\r\n";
-            Log::trace("MasterToBroker: " + aMessage);
+            Log::trace("MasterToBroker: " + aMessage.substr(0, aMessage.length()-2));
             Util::writeFIFO(LOOLWSD::BrokerWritePipe, aMessage);
         }
     }