[Libreoffice-commits] online.git: wsd/ClientSession.cpp

Tor Lillqvist tml at collabora.com
Wed Jul 11 09:34:51 UTC 2018


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

New commits:
commit 1c09d4a6074d9320cd321832f83466fddaf72cd5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jul 11 12:32:29 2018 +0300

    Improve logging a bit
    
    Log all error: cases in ClientSession::handleKitToClientMessage(), not
    just the case of cmd=load with kind= some password failure.
    
    Change-Id: I53c959068f5642ae41157e8feb14fd34fc59dc9a

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 337221f1d..ee2a3f941 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -619,15 +619,19 @@ bool ClientSession::handleKitToClientMessage(const char* buffer, const int lengt
         {
             if (errorCommand == "load")
             {
+                LOG_WRN("Document load failed: " << errorKind);
                 if (errorKind == "passwordrequired:to-view" ||
                     errorKind == "passwordrequired:to-modify" ||
                     errorKind == "wrongpassword")
                 {
                     forwardToClient(payload);
-                    LOG_WRN("Document load failed: " << errorKind);
                     return false;
                 }
             }
+            else
+            {
+                LOG_WRN("Other than load failure: " << errorKind);
+            }
         }
     }
     else if (tokens[0] == "curpart:" && tokens.size() == 2)


More information about the Libreoffice-commits mailing list