diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2022-12-19 07:03:01 -0500 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-12-31 13:33:27 +0100 |
| commit | 2d70853cc35da5695d0742d998f5b86ccd9eb2f0 (patch) | |
| tree | d154db385b57ad6a23a24df0d69e9bdd1623e751 | |
| parent | wsd: log number of unremoved sessions when destroying DocBroker (diff) | |
| download | online-2d70853cc35da5695d0742d998f5b86ccd9eb2f0.tar.gz online-2d70853cc35da5695d0742d998f5b86ccd9eb2f0.zip | |
wsd: minor log improvements
Change-Id: I6dba0540310bb9cafc31a63e92da306eeff8953d
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
| -rw-r--r-- | net/Socket.hpp | 4 | ||||
| -rw-r--r-- | net/WebSocketHandler.hpp | 6 | ||||
| -rw-r--r-- | wsd/DocumentBroker.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/net/Socket.hpp b/net/Socket.hpp index 59793832b6..79201fafb7 100644 --- a/net/Socket.hpp +++ b/net/Socket.hpp @@ -595,7 +595,7 @@ public: /// Stop the polling thread. void stop() { - LOG_DBG("Stopping " << _name << '.'); + LOG_DBG("Stopping SocketPoll thread " << _name); _stop = true; #if MOBILEAPP { @@ -614,7 +614,7 @@ public: void removeSockets() { - LOG_DBG("Removing all sockets from " << _name << '.'); + LOG_DBG("Removing all sockets from SocketPoll thread " << _name); assertCorrectThread(); while (!_pollSockets.empty()) diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp index 8ee3f39ba6..4061eace56 100644 --- a/net/WebSocketHandler.hpp +++ b/net/WebSocketHandler.hpp @@ -756,9 +756,9 @@ protected: ASSERT_CORRECT_SOCKET_THREAD(socket); Buffer& out = socket->getOutBuffer(); - LOG_TRC("WebSocketHandler::sendFrame: Writing to #" - << socket->getFD() << ' ' << len << " bytes in addition to " << out.size() - << " bytes buffered."); + LOG_TRC("WebSocketHandler: Writing " << len << " bytes to #" << socket->getFD() + << " in addition to " << out.size() + << " bytes buffered"); #if ENABLE_DEBUG if ((flags & 0xf) == (int)WSOpCode::Text) // utf8 validate diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 5f887ffcc0..c3a10beda5 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -1449,7 +1449,7 @@ void DocumentBroker::uploadToStorage(const std::shared_ptr<ClientSession>& sessi { assertCorrectThread(); - LOG_TRC("uploadToStorage [" << session->getId() << "]:" << (force ? "" : "not") << " forced"); + LOG_TRC("uploadToStorage [" << session->getId() << "]: " << (force ? "" : "not") << " forced"); if (force) { // Don't reset the force flag if it was set @@ -3412,7 +3412,7 @@ void DocumentBroker::terminateChild(const std::string& closeReason) if (_childProcess) { - LOG_INF("Terminating child [" << getPid() << "] of doc [" << _docKey << "]."); + LOG_INF("Terminating child [" << getPid() << "] of doc [" << _docKey << ']'); _childProcess->close(); } |