loolwsd/LOOLBroker.cpp | 2 +- loolwsd/test/httpwstest.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit fa4e3bcc867e61ab397c484cb65445f0184a5df8 Author: Henry Castro <hcas...@collabora.com> Date: Sun Feb 21 14:48:05 2016 -0400 loolwsd: use kill signal SIGINT diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp index 676464d..2450c79 100644 --- a/loolwsd/LOOLBroker.cpp +++ b/loolwsd/LOOLBroker.cpp @@ -92,7 +92,7 @@ namespace { if (_pid != -1) { - if (kill(_pid, SIGTERM) != 0 && kill(_pid, 0) != 0) + if (kill(_pid, SIGINT) != 0 && kill(_pid, 0) != 0) Log::warn("Cannot terminate lokit [" + std::to_string(_pid) + "]. Abandoning."); _pid = -1; } diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp index 502bb2f..b6c64c4 100644 --- a/loolwsd/test/httpwstest.cpp +++ b/loolwsd/test/httpwstest.cpp @@ -391,7 +391,7 @@ bool HTTPWSTest::isDocumentLoaded(Poco::Net::WebSocket& ws) { int flags; int bytes; - int retries = 5; + int retries = 10; const Poco::Timespan waitTime(1000000); ws.setReceiveTimeout(0); @@ -413,7 +413,7 @@ bool HTTPWSTest::isDocumentLoaded(Poco::Net::WebSocket& ws) break; } } - retries = 5; + retries = 10; } else { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits