diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2022-03-08 08:53:40 -0500 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-03-08 20:10:26 +0100 |
| commit | 231fae4ebd990cb344143759cbdfa19c4f30d4f2 (patch) | |
| tree | af239cafbac7070b5c7ab9dfdbff481bad0217f2 | |
| parent | Bump package version to 6.4.22-1 (diff) | |
| download | online-231fae4ebd990cb344143759cbdfa19c4f30d4f2.tar.gz online-231fae4ebd990cb344143759cbdfa19c4f30d4f2.zip | |
wsd: forced exit after cleaning up jails
cp-6.4.22-1
The static instances cause a lot of grief
when they aren't called in the correct order.
Worse, when we are cleaning up, we don't
even initialize some of them (Admin, for one).
This means that a normal exit will destroy
what isn't created, in some cases (Admin) it
will even force creating instances when we
are destroying others.
This avoid all this by simply exiting bluntly.
Change-Id: I6a9443ca5ab999ed6ca1d27314136472cfc6ddb6
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
| -rw-r--r-- | wsd/LOOLWSD.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 0fdf94334d..8e7bf20aad 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1328,7 +1328,7 @@ void LOOLWSD::initialize(Application& self) { // Cleanup and exit. JailUtil::cleanupJails(ChildRoot); - std::exit(EX_OK); + Util::forcedExit(EX_OK); } #endif if (ChildRoot[ChildRoot.size() - 1] != '/') |