[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - wsd/Storage.cpp

[Mike Kaganski (via logerrit)]

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

New commits:
commit 55ac56ed8ed7cb7c9766dc053c55c459dbbe00c4
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Jul 1 01:29:58 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jul 2 10:03:10 2020 +0200

    Improve logging failed lock request using X-WOPI-LockFailureReason
    
    Change-Id: Ia521422d033861cd002e7eb2123ccc18e9cd0071
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97555
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 6de63613fb7ec00370caa7e3efce4405b688279e)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97570
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 66028aa05..a27240bf1 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -816,8 +816,11 @@ bool WopiStorage::updateLockState(const Authorization& auth, const std::string&
         }
         else
         {
+            std::string sMoreInfo = response.get("X-WOPI-LockFailureReason", "");
+            if (!sMoreInfo.empty())
+                sMoreInfo = ", failure reason: \"" + sMoreInfo + "\"";
             LOG_WRN("Un-successful " << wopiLog << " with status " << response.getStatus() <<
-                    " and response: " << responseString);
+                    sMoreInfo << " and response: " << responseString);
         }
     }
     catch (const Poco::Exception& pexc)