loolwsd/LOOLBroker.cpp | 3 +++ loolwsd/LOOLWSD.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
New commits: commit faf2a57d19b0897eeb985f1b431d901b6cdf8f94 Author: Henry Castro <hcas...@collabora.com> Date: Tue Jan 26 21:22:07 2016 -0400 loolwsd: eof broker pipe diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp index 2bef170..78c4fe6 100644 --- a/loolwsd/LOOLBroker.cpp +++ b/loolwsd/LOOLBroker.cpp @@ -472,6 +472,9 @@ public: pStart++; Log::trace("BrokerFromMaster: " + aMessage); + if (aMessage == "eof") + break; + const auto duration = (std::chrono::steady_clock::now() - lastMaintenanceTime); if (duration >= std::chrono::seconds(10)) { diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 10ddeeb..ed555e8 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -1072,7 +1072,7 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/) threadPool2.joinAll(); // Terminate child processes - Util::writeFIFO(LOOLWSD::BrokerWritePipe, "eof"); + Util::writeFIFO(LOOLWSD::BrokerWritePipe, "eof\r\n"); Log::info("Requesting child process " + std::to_string(pidBroker) + " to terminate"); Process::requestTermination(pidBroker); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits