Make hook shutdown more reliable

This commit is contained in:
Eelco Dolstra 2014-08-19 17:44:59 +02:00
parent 02843ba4cb
commit 029424d17d

View file

@ -617,7 +617,6 @@ HookInstance::HookInstance()
}); });
pid.setSeparatePG(true); pid.setSeparatePG(true);
pid.setKillSignal(SIGTERM);
fromHook.writeSide.close(); fromHook.writeSide.close();
toHook.readSide.close(); toHook.readSide.close();
} }
@ -626,6 +625,7 @@ HookInstance::HookInstance()
HookInstance::~HookInstance() HookInstance::~HookInstance()
{ {
try { try {
toHook.writeSide.close();
pid.kill(true); pid.kill(true);
} catch (...) { } catch (...) {
ignoreException(); ignoreException();