loolwsd/LOOLSession.cpp | 2 +-
loolwsd/LOOLSession.hpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 20d6acae29fd9685e58952e2597834a27e9cb9cc
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Sep 16 15:57:36 2016 +0300
Return true in LOOLSession::forwardToPeer() when peer is closing
Fixes the testEditAnnotationWriter unit test, and doesn't break any
other ones. Many other tests do fail, but they fail also without this
change.
diff --git a/loolwsd/LOOLSession.hpp b/loolwsd/LOOLSession.hpp
index 4c7c485..79b4e1a 100644
--- a/loolwsd/LOOLSession.hpp
+++ b/loolwsd/LOOLSession.hpp
@@ -108,13 +108,13 @@ protected:
else if (peer->isCloseFrame())
{
Log::trace(getName() + ": peer began the closing handshake.
Dropping forward message [" + message + "].");
- return false;
+ return true;
}
else if (peer->isHeadless())
{
// Fail silently and return as there is no actual websocket
// connection in this case.
- Log::info(getName() + ": Ignoring forward message due to peer
being headless");
+ Log::info(getName() + ": Headless peer, not forwarding message ["
+ message + "].");
return true;
}
commit fbd738c32adf12274e2562dfffbfb41a6a6b0b4e
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Sep 16 13:16:49 2016 +0300
One more
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index f9510f1..6b37618 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -218,7 +218,7 @@ bool LOOLSession::handleInput(const char *buffer, int
length)
const auto summary = getAbbreviatedMessage(buffer, length);
try
{
- Log::trace(getName() + " Recv: " + summary);
+ Log::trace(getName() + ": Recv: " + summary);
if (TerminationFlag)
{
Log::warn("Input while terminating: [" + summary + "].");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
