diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2024-04-15 16:58:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@gmail.com> | 2024-04-16 16:43:52 +0100 |
| commit | 2d018d38a5ebc340ec5f907dd2b11186552923ab (patch) | |
| tree | e39808051f44dd0bc401ddf1c8f157d5d53a3b9a /kit | |
| parent | bgsave: warn and fail on unexpected receipt of .uno:Save. (diff) | |
| download | online-2d018d38a5ebc340ec5f907dd2b11186552923ab.tar.gz online-2d018d38a5ebc340ec5f907dd2b11186552923ab.zip | |
bgsave: add unit testing hooks for after bgsave fork & pre exit.
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Change-Id: I35a2ec185762138dc85db39df3e7644c60acfddc
Diffstat (limited to 'kit')
| -rw-r--r-- | kit/Kit.cpp | 2 | ||||
| -rw-r--r-- | kit/KitWebSocket.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/kit/Kit.cpp b/kit/Kit.cpp index 52c8f362d1..8a6bdae47a 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -1425,6 +1425,8 @@ bool Document::forkToSave(const std::function<void()> &childSave, int viewId) childSocket.reset(); // now we just have a single socket to our parent + UnitKit::get().postBackgroundSaveFork(); + // Hard drop our previous connections to coolwsd and shared wakeups.x KitSocketPoll::cleanupChildProcess(); diff --git a/kit/KitWebSocket.cpp b/kit/KitWebSocket.cpp index 8f4ca2e8d7..d5553ef5de 100644 --- a/kit/KitWebSocket.cpp +++ b/kit/KitWebSocket.cpp @@ -209,6 +209,7 @@ void BgSaveChildWebSocketHandler::handleMessage(const std::vector<char>& data) void BgSaveChildWebSocketHandler::onDisconnect() { LOG_TRC("Disconnected background web socket to parent kit"); + UnitKit::get().preBackgroundSaveExit(); Util::forcedExit(EX_OK); } |