[Libreoffice-commits] online.git: loolwsd/DocumentBroker.cpp
Ashod Nakashian
ashod.nakashian at collabora.co.uk
Mon Nov 7 06:30:02 UTC 2016
loolwsd/DocumentBroker.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 8b9372d51728b373512c9c05b8b77481581c4d47
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Sat Nov 5 17:48:15 2016 -0400
loolwsd: improved ChildProcess message handling logs
Change-Id: I28a1de58f4c886d7c6f8c9f723a84e2a8726edc2
Reviewed-on: https://gerrit.libreoffice.org/30625
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 5d187b8..97e21b4 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -37,6 +37,10 @@ void ChildProcess::socketProcessor()
IoUtil::SocketProcessor(_ws,
[this](const std::vector<char>& payload)
{
+ const auto message = LOOLProtocol::getAbbreviatedMessage(payload);
+ LOG_WRN("Recv from child " << this->_pid <<
+ ": [" << message << "].");
+
if (UnitWSD::get().filterChildMessage(payload))
{
return true;
@@ -48,14 +52,14 @@ void ChildProcess::socketProcessor()
return docBroker->handleInput(payload);
}
- Log::warn() << "Child " << this->_pid << " has no DocumentBroker to handle message: ["
- << LOOLProtocol::getAbbreviatedMessage(payload) << "]." << Log::end;
+ LOG_WRN("Child " << this->_pid <<
+ " has no DocumentBroker to handle message: [" << message << "].");
return true;
},
[]() { },
[this]() { return TerminationFlag || this->_stop; });
- Log::debug() << "Child [" << getPid() << "] WS terminated. Notifying DocBroker." << Log::end;
+ LOG_DBG("Child [" << getPid() << "] WS terminated. Notifying DocBroker.");
// Notify the broker that we're done.
More information about the Libreoffice-commits
mailing list