[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp loolwsd/LOOLKit.cpp

Tor Lillqvist tml at collabora.com
Fri Mar 4 09:33:19 UTC 2016


 loolwsd/ChildProcessSession.cpp |    2 +-
 loolwsd/LOOLKit.cpp             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 28fd1ace0cc3cfc8a3ff23cf64aa7fe826ea86d1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Mar 4 11:32:25 2016 +0200

    Make it clearer in the logging which callback is which

diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 9df3d5a..a2e28f9 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -122,7 +122,7 @@ public:
     {
         auto lock = _session.getLock();
 
-        Log::trace() << "Callback [" << _session.getViewId() << "] "
+        Log::trace() << "CallbackWorker::callback [" << _session.getViewId() << "] "
                      << callbackTypeToString(nType)
                      << " [" << rPayload << "]." << Log::end;
         if (_session.isDisconnected())
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index b2d0eda..e335360 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -528,7 +528,7 @@ private:
     static void KitCallback(int nType, const char* pPayload, void* pData)
     {
         Document* self = reinterpret_cast<Document*>(pData);
-        Log::trace() << "Callback "
+        Log::trace() << "Document::KitCallback "
                      << KitCallbackTypeToString(nType)
                      << " [" << (pPayload ? pPayload : "") << "]." << Log::end;
 


More information about the Libreoffice-commits mailing list