strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

loolwsd: Code reuse, and don't send 'remview' message to inactive clients

Browse source 
Use the existing function notifyOtherSessions() to broadcast the
message.

The function also takes care of sending this message only to
active clients.

Change-Id: I98d40429de17463167a67cb10ba59381a0cbc525
This commit is contained in:
Pranav Kant 2016-09-03 02:27:37 +05:30
parent 9edb1c2994
commit 3f421be4da
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
loolwsd/LOOLKit.cpp
View file

@ -419,7 +419,6 @@ public:
Log::info("Document ctor for url [" + _url + "] on child [" + _jailId +
"] LOK_VIEW_CALLBACK=" + std::to_string(_multiView) + ".");
assert(_loKit && _loKit->get());
_callbackThread.start(*this);
}
@ -910,22 +909,12 @@ private:
Log::info("Unloading [" + sessionId + "].");
// Broadcast the demise and removal of session.
notifyOtherSessions(sessionId, "remview: " + std::to_string(session.getViewId()));
if (_loKitDocument == nullptr)
{
std::unique_lock<std::mutex> lock(_mutex);
// We should be removed by this point, otherwise
// our closed connection will throw, if not segfault.
for (const auto& pair : _connections)
{
assert(sessionId != pair.second->getSessionId() && "Unloading connection still lingering.");
pair.second->getSession()->sendTextFrame("remview: " + std::to_string(session.getViewId()));
}
if (_loKitDocument == nullptr)
{
Log::error("Unloading session [" + sessionId + "] without loKitDocument.");
return;
}
Log::error("Unloading session [" + sessionId + "] without loKitDocument.");
return;
}
--_clientViews;