kit/ForKit.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit b9db83518bf7a3236a5c9d970162302ecf7ff65a
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Sun Jun 3 17:54:50 2018 -0400
wsd: warn when we have no kits and we are not exiting just yet
Change-Id: I8c19dcea3eb900a989aebac7ef96793af31bdce8
Reviewed-on: https://gerrit.libreoffice.org/55576
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index 89f49e53d..8d373ee6a 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -221,6 +221,11 @@ static void cleanupChildren()
LOG_INF("Child " << exitedChildPid << " has exited, will remove
its jail [" << it->second << "].");
jails.emplace_back(it->second);
childJails.erase(it);
+ if (childJails.empty() && !TerminationFlag)
+ {
+ // We ran out of kits and we aren't terminating.
+ LOG_WRN("No live Kits exist, and we are not terminating yet.");
+ }
}
else
{
@@ -264,7 +269,7 @@ static int createLibreOfficeKit(const std::string&
childRoot,
const size_t delaySecs =
std::stoul(std::getenv("SLEEPKITFORDEBUGGER"));
if (delaySecs > 0)
{
- std::cerr << "Sleeping " << delaySecs
+ std::cerr << "Kit: Sleeping " << delaySecs
<< " seconds to give you time to attach debugger to
process "
<< Process::id() << std::endl;
Thread::sleep(delaySecs * 1000);
@@ -353,7 +358,7 @@ int main(int argc, char** argv)
const size_t delaySecs = std::stoul(std::getenv("SLEEPFORDEBUGGER"));
if (delaySecs > 0)
{
- std::cerr << "Sleeping " << delaySecs
+ std::cerr << "Forkit: Sleeping " << delaySecs
<< " seconds to give you time to attach debugger to
process "
<< Process::id() << std::endl;
Thread::sleep(delaySecs * 1000);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
