[Libreoffice-commits] online.git: common/Log.hpp kit/Kit.cpp net/Socket.cpp wsd/LOOLWSD.cpp

[Ashod Nakashian (via logerrit)]

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

New commits:
commit a4a4d656322f69c9f7c6b5ac54f8c8baeacc5a86
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Sep 29 23:32:45 2019 -0400
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Oct 28 10:48:01 2019 +0100

    wsd: logging improvements
    
    Always log when we set the termination flag
    so we can trace how (and implicitly why) we
    terminated. In practice trace logging is not
    enabled, so a key event such as termination
    should be logged at info level.
    
    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>
    (cherry picked from commit 3f8d516e1399df687c2935fc551b171cbd850b7b)
    
    Change-Id: Id6615181c81ea56777f44b551b39925065b0e578
    Reviewed-on: https://gerrit.libreoffice.org/81562
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/common/Log.hpp b/common/Log.hpp
index df0a06536..495b4f0e9 100644
--- a/common/Log.hpp
+++ b/common/Log.hpp
@@ -233,7 +233,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 4c59b8d79..d6d255bf1 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2141,7 +2141,7 @@ protected:
         }
         else if (tokens[0] == "exit")
         {
-            LOG_TRC("Setting TerminationFlag due to 'exit' command from parent.");
+            LOG_INF("Setting TerminationFlag due to 'exit' command from parent.");
             SigUtil::getTerminationFlag() = true;
             document.reset();
         }
diff --git a/net/Socket.cpp b/net/Socket.cpp
index 345e1d652..cf7087170 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -174,11 +174,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();
@@ -193,6 +191,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 ca0880812..d7ebcbb26 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1574,6 +1574,7 @@ void PrisonerPoll::wakeupHook()
                 // block until the replay finishes
                 replayThread->join();
 
+                LOG_INF("Setting TerminationFlag");
                 SigUtil::getTerminationFlag() = true;
             }
 #endif