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

[Tor Lillqvist]

 loolwsd/LOOLKit.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 38ddcf5243276bab51b9c1ccbe15e1821f05966f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Mar 2 13:12:27 2016 +0200

    Don't log the CR LF at the end of a response

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index ca340d6..e7cf26b 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -1010,8 +1010,13 @@ void lokit_main(const std::string& childRoot,
                         response += "bad \r\n";
                     }
 
-                    Log::trace("KitToBroker: " + response);
                     Util::writeFIFO(writerBroker, response);
+
+                    // Don't log the CR LF at end
+                    assert(response.length() > 2);
+                    assert(response[response.length()-1] == '\n');
+                    assert(response[response.length()-2] == '\r');
+                    Log::trace("KitToBroker: " + response.substr(0, response.length()-2));
                     message.clear();
                 }
             }