[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - common/Log.hpp kit/Kit.cpp net/Socket.cpp wsd/LOOLWSD.cpp

[Ashod Nakashian (via logerrit)]

 common/Log.hpp  |    2 +-
 kit/Kit.cpp     |    4 ++--
 net/Socket.cpp  |    7 +++----
 wsd/LOOLWSD.cpp |    1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 3f8d516e1399df687c2935fc551b171cbd850b7b
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Sep 29 23:32:45 2019 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat Oct 19 20:56:22 2019 +0200

    wsd: logging improvements
    
    Change-Id: Id6615181c81ea56777f44b551b39925065b0e578
    Reviewed-on: https://gerrit.libreoffice.org/80324
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/common/Log.hpp b/common/Log.hpp
index bf05fc7ce..08c7edd5d 100644
--- a/common/Log.hpp
+++ b/common/Log.hpp
@@ -206,7 +206,7 @@ namespace Log
         if (id != std::thread::id())
         {
             std::ostringstream os;
-            os << std::hex << "0x" << id << std::dec;
+            os << std::hex << "0x" << id;
             return os.str();
         }
 
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 0681bb449..72937196f 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2069,7 +2069,7 @@ protected:
         }
         else if (tokens[0] == "exit")
         {
-            LOG_TRC("Setting TerminationFlag due to 'exit' command from parent.");
+            LOG_WRN("Setting TerminationFlag due to 'exit' command from parent.");
             TerminationFlag = true;
             document.reset();
         }
@@ -2438,7 +2438,7 @@ void lokit_main(
 #ifndef MOBILEAPP
             if (document && document->purgeSessions() == 0)
             {
-                LOG_INF("Last session discarded. Setting TerminationFlag");
+                LOG_WRN("Last session discarded. Setting TerminationFlag");
                 TerminationFlag = true;
             }
 #endif
diff --git a/net/Socket.cpp b/net/Socket.cpp
index 5b7d21135..9d647dd43 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -162,11 +162,9 @@ void SocketPoll::pollingThreadEntry()
     try
     {
         Util::setThreadName(_name);
-        LOG_INF("Starting polling thread [" << _name << "].");
-
         _owner = std::this_thread::get_id();
-        LOG_DBG("Thread affinity of " << _name << " set to " <<
-                Log::to_string(_owner) << ".");
+        LOG_INF("Starting polling thread [" << _name << "] with thread affinity set to "
+                                            << Log::to_string(_owner) << '.');
 
         // Invoke the virtual implementation.
         pollingThread();
@@ -181,6 +179,7 @@ void SocketPoll::pollingThreadEntry()
     }
 
     _threadFinished = true;
+    LOG_INF("Finished polling thread [" << _name << "].");
 }
 
 void SocketPoll::wakeupWorld()
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 93987d71c..5b8f43949 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1540,6 +1540,7 @@ void PrisonerPoll::wakeupHook()
                 // block until the replay finishes
                 replayThread->join();
 
+                LOG_WRN("Setting TerminationFlag");
                 TerminationFlag = true;
             }
 #endif