summaryrefslogtreecommitdiff
path: root/kit
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2019-06-28 11:18:59 +0100
committerMichael Meeks <michael.meeks@collabora.com>2019-10-03 18:52:29 +0100
commit5e0e6006e31b05c73c405253397a1e1b5c2c862f (patch)
tree53650f11f604bbe25dacea554290da8872847ab3 /kit
parent5f28613c4820b359ce9f2a2a148edc7959e67cba (diff)
Fatal exceptions need to take the kit process down.
Otherwise the Kit main-loop continues while its event processing thread is dead, leaving the client stalled. Change-Id: I7089ed5b5bd8499623624ffdb84c22cedd80cc7e
Diffstat (limited to 'kit')
-rw-r--r--kit/Kit.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 2a26b7118..eb3f006b7 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2114,11 +2114,15 @@ public:
}
catch (const std::exception& exc)
{
- LOG_ERR("QueueHandler::run: Exception: " << exc.what());
+ LOG_FTL("QueueHandler::run: Exception: " << exc.what());
+ Log::shutdown();
+ std::_Exit(Application::EXIT_SOFTWARE);
}
catch (...)
{
LOG_FTL("QueueHandler::run: Unknown exception");
+ Log::shutdown();
+ std::_Exit(Application::EXIT_SOFTWARE);
}
}