[Libreoffice-commits] online.git: wsd/LOOLWebSocket.hpp

[Tor Lillqvist]

 wsd/LOOLWebSocket.hpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 55010980aa05ee10b0b85aa5110f8d824dad0adf
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 18 15:45:33 2017 +0200

    Avoid misleading logging
    
    If Poco::Bet::WebSocket::receiveFrame() returns 0 or -1, flags is
    likely meaningless.
    
    Change-Id: Ia1d7cbcbfc338f9d0c60e14a6b460ddc090d0b6d

diff --git a/wsd/LOOLWebSocket.hpp b/wsd/LOOLWebSocket.hpp
index 850560e..dc2c805 100644
--- a/wsd/LOOLWebSocket.hpp
+++ b/wsd/LOOLWebSocket.hpp
@@ -115,7 +115,11 @@ public:
         while (poll(waitTime, Poco::Net::Socket::SELECT_READ))
         {
             const int n = Poco::Net::WebSocket::receiveFrame(buffer, length, flags);
-            LOG_TRC("Got frame: " << LOOLProtocol::getAbbreviatedFrameDump(buffer, n, flags));
+
+            if (n <= 0)
+                LOG_TRC("Got nothing (" << n << ")");
+            else
+                LOG_TRC("Got frame: " << LOOLProtocol::getAbbreviatedFrameDump(buffer, n, flags));
 
             if ((flags & WebSocket::FRAME_OP_BITMASK) == WebSocket::FRAME_OP_CLOSE)
             {