loolwsd/LOOLBroker.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 23ca0f0d77b3d78d0aac259bb50c85314a095095
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Thu Jan 21 09:02:12 2016 -0500
loolwsd: detect child termination by signal as well as exit
Change-Id: Ic4dc89a7ad1470cc7afbd763b904b617b36e62aa
Reviewed-on: https://gerrit.libreoffice.org/21681
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 1a3954b..65e2a16 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -598,8 +598,11 @@ static bool waitForTerminationChild(const Process::PID
aPID, signed count = CHIL
{
int status;
waitpid(aPID, &status, WUNTRACED | WNOHANG);
- if (WIFEXITED(status))
+ if (WIFEXITED(status) || WIFSIGNALED(status))
+ {
+ Log::info("Child " + std::to_string(aPID) + " terminated.");
return true;
+ }
sleep(MAINTENANCE_INTERVAL);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
