loolwsd/ClientSession.cpp | 11 ----------- loolwsd/PrisonerSession.cpp | 1 - 2 files changed, 12 deletions(-)
New commits: commit 96934590a003d6a57972da4933c1eab014486347 Author: Ashod Nakashian <[email protected]> Date: Thu Aug 11 12:52:20 2016 -0400 loolwsd: do not cache status since it has per-view info Change-Id: Ia32383cffd7b489fe3124457897991555b918db6 Reviewed-on: https://gerrit.libreoffice.org/28117 Reviewed-by: Ashod Nakashian <[email protected]> Tested-by: Ashod Nakashian <[email protected]> diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp index d2debdf..c0607a9 100644 --- a/loolwsd/ClientSession.cpp +++ b/loolwsd/ClientSession.cpp @@ -250,17 +250,6 @@ bool ClientSession::loadDocument(const char* /*buffer*/, int /*length*/, StringT bool ClientSession::getStatus(const char *buffer, int length) { - const std::string status = _docBroker->tileCache().getTextFile("status.txt"); - if (!status.empty()) - { - sendTextFrame(status); - - // And let clients know if they hold the edit lock. - const auto msg = "editlock: " + std::to_string(isEditLocked()); - Log::debug("Returning [" + msg + "] in response to status."); - return sendTextFrame(msg); - } - return forwardToPeer(_peer, buffer, length, false); } diff --git a/loolwsd/PrisonerSession.cpp b/loolwsd/PrisonerSession.cpp index 95a5fbd..1dc9cbe 100644 --- a/loolwsd/PrisonerSession.cpp +++ b/loolwsd/PrisonerSession.cpp @@ -183,7 +183,6 @@ bool PrisonerSession::_handleInput(const char *buffer, int length) else if (tokens[0] == "status:") { _docBroker->setLoaded(); - _docBroker->tileCache().saveTextFile(std::string(buffer, length), "status.txt"); // Forward the status response to the client. forwardToPeer(_peer, buffer, length, isBinary); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
