loolwsd/LOOLWSD.cpp | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit d36306e347ae6b3ed82971a52dca9f6b639c4a42
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Mon Nov 14 00:08:38 2016 -0500
loolwsd: broadcast that the server is shutting down
Change-Id: Ib94eb991763094cd6fe0ab36636f48f9844586c5
Reviewed-on: https://gerrit.libreoffice.org/30833
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 4bd22bb..2d2c15a 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -2076,6 +2076,7 @@ int LOOLWSD::main(const std::vector<std::string>&
/*args*/)
// Stop the listening to new connections
// and wait until sockets close.
LOG_INF("Stopping server socket listening.");
+ Util::alertAllUsers("internal", "shutdown");
srv.stop();
srv2.stop();
threadPool.joinAll();
@@ -2143,6 +2144,8 @@ void alertAllUsers(const std::string& cmd, const
std::string& kind)
{
std::lock_guard<std::mutex> DocBrokersLock(DocBrokersMutex);
+ LOG_INF("Alerting all users: cmd=" << cmd << ", kind=" << kind);
+
for (auto& brokerIt : DocBrokers)
{
auto lock = brokerIt.second->getLock();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
