test/run_unit.sh.in | 3 ++-
wsd/LOOLWSD.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 1ad4037dd78b8e319d3615c00010bbdf2b76cf35
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Wed Apr 5 00:36:33 2017 -0400
wsd: allow for slow startup of LOK
Change-Id: Idf821f2a3638e76e1a8b169d5672a2059b00491c
Reviewed-on: https://gerrit.libreoffice.org/36118
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/test/run_unit.sh.in b/test/run_unit.sh.in
index dc1d4021..4b8e71cf 100755
--- a/test/run_unit.sh.in
+++ b/test/run_unit.sh.in
@@ -75,13 +75,14 @@ if test "z$tst" == "z"; then
--o:child_root_path="$jails_path" \
--o:storage.filesystem[@allow]=true \
--o:logging.level=trace \
- --o:logging.file[@enable]=false \
+ --o:logging.file[@enable]=false \
--o:ssl.key_file_path="${abs_top_builddir}/etc/key.pem" \
--o:ssl.cert_file_path="${abs_top_builddir}/etc/cert.pem" \
--o:ssl.ca_file_path="${abs_top_builddir}/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
> "$tst_log" 2>&1 &
echo " executing test"
+ sleep 5 # allow for wsd to startup
oldpath=`pwd`
cd "${abs_top_builddir}/test"
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index f2f6d0df..e05206c6 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2410,7 +2410,7 @@ int LOOLWSD::innerMain()
{
std::unique_lock<std::mutex> lock(NewChildrenMutex);
- const auto timeoutMs = CHILD_TIMEOUT_MS * (LOOLWSD::NoCapsForKit ? 150
: 3);
+ const auto timeoutMs = CHILD_TIMEOUT_MS * (LOOLWSD::NoCapsForKit ? 150
: 10);
const auto timeout = std::chrono::milliseconds(timeoutMs);
// Make sure we have at least one before moving forward.
LOG_TRC("Waiting for a new child for a max of " << timeoutMs << "
ms.");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
