strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Fix removal of kit procs when they are blocked"

Browse source 
This reverts commit 3046c5748b.

This breaks mobile apps for now. Apparently the 'close'
forces a different ordering than expected on the Child.
This commit is contained in:
Michael Meeks 2020-02-13 00:23:43 +00:00
parent 4fc7bc76db
commit faee2bdb24
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wsd/DocumentBroker.hpp
View file

@ -119,23 +119,14 @@ public:
// Shutdown the socket.
if (_ws)
{
_ws->shutdown();
// If socket was shutdown and buffers cleared then there's no
// reason to keep the object. This is crucial for DocumentBroker
// to be considered as not alive and associated kit process
// terminated in cleanupDocBrokers. Otherwise if kit process
// hangs then the asociated DocumentBroker object won't be
// removed and kit process won't be forcefully terminated. This
// is in conjunction with not clearing _pid data member which
// is needed later in call to terminate().
_ws.reset();
}
}
catch (const std::exception& ex)
{
LOG_ERR("Error while closing child process: " << ex.what());
}
_pid = -1;
}
/// Kill or abandon the child.