[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp loolwsd/LOOLWSD.cpp loolwsd/MasterProcessSession.cpp
Ashod Nakashian
ashod.nakashian at collabora.co.uk
Wed Apr 27 03:51:14 UTC 2016
loolwsd/ChildProcessSession.cpp | 1 -
loolwsd/LOOLWSD.cpp | 3 +++
loolwsd/MasterProcessSession.cpp | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit ffc873895d2f294502e1bb1ba2316802b3265c8e
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Tue Apr 26 23:44:23 2016 -0400
loolwsd: logs
Change-Id: Ic7632824c32d66eaf7d496e0824a57ebbef986f5
Reviewed-on: https://gerrit.libreoffice.org/24421
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 71fd825..a6cd86d 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -663,7 +663,6 @@ bool ChildProcessSession::getStatus(const char* /*buffer*/, int /*length*/)
}
sendTextFrame(status);
-
return true;
}
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index be728a6..e8f2e05 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -464,6 +464,7 @@ private:
// indicator to the client that document broker is searching
std::string status("statusindicator: find");
+ Log::trace("Sending to Client [" + status + "].");
ws->sendFrame(status.data(), (int) status.size());
// Remove the leading '/' in the GET URL.
@@ -573,6 +574,7 @@ private:
// indicator to a client that is waiting to connect to lokit process
status = "statusindicator: connect";
+ Log::trace("Sending to Client [" + status + "].");
ws->sendFrame(status.data(), (int) status.size());
// Wait until the client has connected with a prison socket.
@@ -581,6 +583,7 @@ private:
// Let messages flow
status = "statusindicator: ready";
+ Log::trace("Sending to Client [" + status + "].");
ws->sendFrame(status.data(), (int) status.size());
QueueHandler handler(queue, session, "wsd_queue_" + session->getId());
diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index 12660fe..9ccab85 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -205,6 +205,7 @@ bool MasterProcessSession::_handleInput(const char *buffer, int length)
// let clients know if they hold the edit lock
std::string message = "editlock: ";
message += std::to_string(peer->isEditLocked());
+ Log::debug("Forwarding [" + message + "] in response to status.");
forwardToPeer(message.c_str(), message.size());
}
else if (tokens[0] == "commandvalues:")
More information about the Libreoffice-commits
mailing list