Kill the build hook rather than shutting it down cleanly
Waiting for the hook to shut down cleanly sometimes seems to lead to hangs.
This commit is contained in:
parent
228ea7c2f9
commit
fbf0b2fa45
1 changed files with 1 additions and 7 deletions
|
@ -710,13 +710,7 @@ HookInstance::HookInstance()
|
||||||
HookInstance::~HookInstance()
|
HookInstance::~HookInstance()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
/* Cleanly shut down the hook by closing its stdin if it's not
|
pid.kill();
|
||||||
already building. Otherwise pid's destructor will kill
|
|
||||||
it. */
|
|
||||||
if (pid != -1 && toHook.writeSide != -1) {
|
|
||||||
toHook.writeSide.close();
|
|
||||||
pid.wait(true);
|
|
||||||
}
|
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
ignoreException();
|
ignoreException();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue