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

[Ashod Nakashian]

 loolwsd/ChildProcessSession.cpp |   10 +++++-----
 loolwsd/LOOLKit.cpp             |    2 +-
 loolwsd/test/UnitPrefork.cpp    |    2 +-
 loolwsd/test/helpers.hpp        |    1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 2829febd1535ab735328571a3853f99408080bb1
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat May 7 23:42:58 2016 -0400

    loolwsd: logging improvements
    
    Change-Id: I5591e309ac9fbcbd79c816b26e65f51b77018bb2
    Reviewed-on: https://gerrit.libreoffice.org/24748
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index cb4b16c..db9424d 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -149,11 +149,11 @@ public:
                     }
 
                     _session.sendTextFrame("invalidatetiles:"
-                                       " part=" + std::to_string(curPart) +
-                                       " x=" + std::to_string(x) +
-                                       " y=" + std::to_string(y) +
-                                       " width=" + std::to_string(width) +
-                                       " height=" + std::to_string(height));
+                                           " part=" + std::to_string(curPart) +
+                                           " x=" + std::to_string(x) +
+                                           " y=" + std::to_string(y) +
+                                           " width=" + std::to_string(width) +
+                                           " height=" + std::to_string(height));
                 }
                 else
                 {
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 2f524cb..af05e17 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -1347,7 +1347,7 @@ void lokit_main(const std::string& childRoot,
     }
     catch (const Exception& exc)
     {
-        Log::error() << exc.name() << ": " << exc.displayText()
+        Log::error() << "Poco Exception: " << exc.displayText()
                      << (exc.nested() ? " (" + exc.nested()->displayText() + ")" : "")
                      << Log::end;
     }
diff --git a/loolwsd/test/UnitPrefork.cpp b/loolwsd/test/UnitPrefork.cpp
index aa3335f..c265831 100644
--- a/loolwsd/test/UnitPrefork.cpp
+++ b/loolwsd/test/UnitPrefork.cpp
@@ -144,7 +144,7 @@ namespace {
         size_t numPSSKb = 0;
         size_t numDirtyKb = 0;
 
-        char line[4096];
+        char line[4096] = { 0 };
         while (fgets(line, sizeof (line), inStream))
         {
             const char *value;
diff --git a/loolwsd/test/helpers.hpp b/loolwsd/test/helpers.hpp
index 8258d63..a31d19a 100644
--- a/loolwsd/test/helpers.hpp
+++ b/loolwsd/test/helpers.hpp
@@ -60,6 +60,7 @@ void getDocumentPathAndURL(const char* document, std::string& documentPath, std:
 inline
 void sendTextFrame(Poco::Net::WebSocket& socket, const std::string& string)
 {
+    std::cerr << "Sending " << string.size() << " bytes: " << LOOLProtocol::getAbbreviatedMessage(string) << std::endl;
     socket.sendFrame(string.data(), string.size());
 }