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

[Ashod Nakashian]

 loolwsd/DocumentBroker.cpp     |    1 +
 loolwsd/test/httpcrashtest.cpp |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 48bdc1e97a49479113fc3d71bdb8a07e9dd827c9
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Apr 23 16:00:09 2016 -0400

    loolwsd: silence unused-result gcc error
    
    Change-Id: Ide71b0b585a2b822cedc93e0b4aae11ab4aa1b34
    Reviewed-on: https://gerrit.libreoffice.org/24333
    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 deab8fc..b749f77 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -287,6 +287,7 @@ size_t DocumentBroker::addSession(std::shared_ptr<MasterProcessSession>& session
     // Request a new session from the child kit.
     const std::string aMessage = "session " + id + " " + _docKey + "\n";
     Log::debug("DocBroker to Child: " + aMessage.substr(0, aMessage.length() - 1));
+    //FIXME: The socket could be broken, child dead, etc. Must recover!
     _childProcess->getWebSocket()->sendFrame(aMessage.data(), aMessage.size());
 
     return _sessions.size();
diff --git a/loolwsd/test/httpcrashtest.cpp b/loolwsd/test/httpcrashtest.cpp
index 63d2c87..4169ebd 100644
--- a/loolwsd/test/httpcrashtest.cpp
+++ b/loolwsd/test/httpcrashtest.cpp
@@ -140,7 +140,11 @@ void HTTPCrashTest::testCrashKit()
                     Poco::StringTokenizer tokens(statString, " ");
                     if (tokens.count() > 3 && tokens[1] == "(loolkit)")
                     {
-                        std::system(killLOKit.c_str());
+                        const auto res = std::system(killLOKit.c_str());
+                        if (res != 0)
+                        {
+                            std::cerr << "exit " + std::to_string(res) + " from " + killLOKit << std::endl;
+                        }
                     }
                 }
             }