loolwsd/LOOLSession.cpp | 4 ++-- loolwsd/PrisonerSession.cpp | 2 +- loolwsd/test/countloolkits.hpp | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-)
New commits: commit 8518620ddd6d50e261e3775287a6437c65ba823c Author: Tor Lillqvist <t...@collabora.com> Date: Fri Sep 16 13:09:00 2016 +0300 Try to unify format of log messages a tiny bit Lots more of that to do if one could be bothered. Just some details I noticed in passing. diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp index 055a489..f9510f1 100644 --- a/loolwsd/LOOLSession.cpp +++ b/loolwsd/LOOLSession.cpp @@ -81,7 +81,7 @@ bool LOOLSession::sendTextFrame(const char* buffer, const int length) return false; } - Log::trace(getName() + " Send: " + getAbbreviatedMessage(buffer, length)); + Log::trace(getName() + ": Send: " + getAbbreviatedMessage(buffer, length)); try { std::unique_lock<std::mutex> lock(_mutex); @@ -113,7 +113,7 @@ bool LOOLSession::sendBinaryFrame(const char *buffer, int length) return false; } - Log::trace(getName() + " Send: " + std::to_string(length) + " bytes"); + Log::trace(getName() + ": Send: " + std::to_string(length) + " bytes"); try { std::unique_lock<std::mutex> lock(_mutex); diff --git a/loolwsd/PrisonerSession.cpp b/loolwsd/PrisonerSession.cpp index 35ce139..b7368f9 100644 --- a/loolwsd/PrisonerSession.cpp +++ b/loolwsd/PrisonerSession.cpp @@ -76,7 +76,7 @@ bool PrisonerSession::_handleInput(const char *buffer, int length) if (tokens[0] == "unocommandresult:") { const std::string stringMsg(buffer, length); - Log::info(getName() + "Command: " + stringMsg); + Log::info(getName() + ": Command: " + stringMsg); const auto index = stringMsg.find_first_of('{'); if (index != std::string::npos) { commit 42fdb3b079d88c00e327b37ede0640b6604d0c83 Author: Tor Lillqvist <t...@collabora.com> Date: Fri Sep 16 12:50:54 2016 +0300 Drop always-defaulted 'timeoutMs' parameter to countLoolKitProcesses() Also, drop the pointless use of POLL_TIMEOUT_MS, we first multiplied by it and then divided. diff --git a/loolwsd/test/countloolkits.hpp b/loolwsd/test/countloolkits.hpp index e5e4632..d0c479c 100644 --- a/loolwsd/test/countloolkits.hpp +++ b/loolwsd/test/countloolkits.hpp @@ -66,9 +66,11 @@ int getLoolKitProcessCount() } static -int countLoolKitProcesses(const int expected, const int timeoutMs = POLL_TIMEOUT_MS * 10) +int countLoolKitProcesses(const int expected) { - const size_t repeat = 1 + (2 * timeoutMs / POLL_TIMEOUT_MS); + // Fairly random number, I don't think there is any actual reason for using exactly this repeat + // count. + const size_t repeat = 21; auto count = getLoolKitProcessCount(); for (size_t i = 0; i < repeat; ++i) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits