diff options
| -rw-r--r-- | loolwsd/ChildProcessSession.cpp | 2 | ||||
| -rw-r--r-- | loolwsd/LOOLBroker.cpp | 2 | ||||
| -rw-r--r-- | loolwsd/LOOLKit.cpp | 4 | ||||
| -rw-r--r-- | loolwsd/LOOLSession.cpp | 4 | ||||
| -rw-r--r-- | loolwsd/LOOLWSD.cpp | 2 | ||||
| -rw-r--r-- | loolwsd/MasterProcessSession.cpp | 3 | ||||
| -rw-r--r-- | loolwsd/QueueHandler.hpp | 2 |
7 files changed, 10 insertions, 9 deletions
diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp index 54a689fa1..5edc7b5dc 100644 --- a/loolwsd/ChildProcessSession.cpp +++ b/loolwsd/ChildProcessSession.cpp @@ -71,7 +71,7 @@ void ChildProcessSession::disconnect(const std::string& reason) { if (!isDisconnected()) { - std::unique_lock<std::recursive_mutex> lock(Mutex); + std::unique_lock<std::recursive_mutex> lock(Mutex); if (_multiView) _loKitDocument->pClass->setView(_loKitDocument, _viewId); diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp index 7647dcc20..ae2a5a77c 100644 --- a/loolwsd/LOOLBroker.cpp +++ b/loolwsd/LOOLBroker.cpp @@ -471,7 +471,7 @@ public: { pStart++; - Log::trace("Recv: " + aMessage); + Log::trace("BrokerFromMaster: " + aMessage); const auto duration = (std::chrono::steady_clock::now() - lastMaintenanceTime); if (duration >= std::chrono::seconds(10)) { diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp index 5fac3eb2f..67966eff4 100644 --- a/loolwsd/LOOLKit.cpp +++ b/loolwsd/LOOLKit.cpp @@ -386,7 +386,7 @@ public: std::string firstLine = getFirstLine(buffer, n); if (firstLine == "eof") { - Log::info("Recieved EOF. Finishing."); + Log::info("Received EOF. Finishing."); break; } @@ -905,7 +905,7 @@ void lokit_main(const std::string &loSubPath, const std::string& jailId, const s aResponse = "bad \r\n"; } - Log::trace("Send: " + aResponse); + Log::trace("KitToBroker: " + aResponse); Util::writeFIFO(writerBroker, aResponse); aMessage.clear(); } diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp index 92d8f8515..821835de5 100644 --- a/loolwsd/LOOLSession.cpp +++ b/loolwsd/LOOLSession.cpp @@ -197,10 +197,10 @@ bool LOOLSession::handleInput(const char *buffer, int length) { assert(buffer != nullptr); - Log::trace(getName() + " Recv: " + getAbbreviatedMessage(buffer, length)); - try { + Log::trace(getName() + " Recv: " + getAbbreviatedMessage(buffer, length)); + return _handleInput(buffer, length); } catch (const Exception& exc) diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index edfcb7d83..91da2f937 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -236,7 +236,7 @@ void SocketProcessor(std::shared_ptr<WebSocket> ws, const std::string firstLine = getFirstLine(buffer, n); if (firstLine == "eof") { - Log::info("Recieved EOF. Finishing."); + Log::info("Received EOF. Finishing."); break; } diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp index efb07b801..4d62d9bfa 100644 --- a/loolwsd/MasterProcessSession.cpp +++ b/loolwsd/MasterProcessSession.cpp @@ -435,7 +435,7 @@ bool MasterProcessSession::loadDocument(const char* /*buffer*/, int /*length*/, // request new URL session const std::string aMessage = "request " + getId() + " " + _docURL + "\r\n"; - Log::debug("Sending to Broker: " + aMessage); + Log::trace("MasterToBroker: " + aMessage); Util::writeFIFO(LOOLWSD::BrokerWritePipe, aMessage); } catch (const Poco::SyntaxException&) @@ -748,6 +748,7 @@ void MasterProcessSession::dispatchChild() Log::info() << "Retrying child permission... " << nRequest << Log::end; // request again new URL session const std::string aMessage = "request " + getId() + " " + _docURL + "\r\n"; + Log::trace("MasterToBroker: " + aMessage); Util::writeFIFO(LOOLWSD::BrokerWritePipe, aMessage); } } diff --git a/loolwsd/QueueHandler.hpp b/loolwsd/QueueHandler.hpp index 7a1eb4500..97c70d856 100644 --- a/loolwsd/QueueHandler.hpp +++ b/loolwsd/QueueHandler.hpp @@ -41,7 +41,7 @@ public: const std::string input = _queue.get(); if (input == "eof") { - Log::info("Recieved EOF. Finishing."); + Log::info("Received EOF. Finishing."); break; } |