[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
95/118: Make hook shutdown more reliable
From: |
Ludovic Courtès |
Subject: |
95/118: Make hook shutdown more reliable |
Date: |
Tue, 19 May 2015 14:45:56 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit d4e7c195fabf0f24c2ffbd4ca8f189489bbbf44d
Author: Eelco Dolstra <address@hidden>
Date: Tue Aug 19 17:44:59 2014 +0200
Make hook shutdown more reliable
---
nix/libstore/build.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index 05024f5..b848b8c 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -629,7 +629,6 @@ HookInstance::HookInstance()
});
pid.setSeparatePG(true);
- pid.setKillSignal(SIGTERM);
fromHook.writeSide.close();
toHook.readSide.close();
}
@@ -638,6 +637,7 @@ HookInstance::HookInstance()
HookInstance::~HookInstance()
{
try {
+ toHook.writeSide.close();
pid.kill(true);
} catch (...) {
ignoreException();
- 83/118: Call commonChildInit() before doing chroot init, (continued)
- 83/118: Call commonChildInit() before doing chroot init, Ludovic Courtès, 2015/05/19
- 84/118: Remove ugly hack for detecting build environment setup errors, Ludovic Courtès, 2015/05/19
- 85/118: Get rid of "killing <pid>" message for unused build hooks, Ludovic Courtès, 2015/05/19
- 93/118: Reduce verbosity, Ludovic Courtès, 2015/05/19
- 92/118: Propagate remote timeouts properly, Ludovic Courtès, 2015/05/19
- 87/118: Refactor, Ludovic Courtès, 2015/05/19
- 79/118: Allow regular files as GC roots, Ludovic Courtès, 2015/05/19
- 89/118: Doh, Ludovic Courtès, 2015/05/19
- 78/118: Remove some dead code, Ludovic Courtès, 2015/05/19
- 82/118: Eliminate redundant copy, Ludovic Courtès, 2015/05/19
- 95/118: Make hook shutdown more reliable,
Ludovic Courtès <=
- 81/118: findRoots(): Prevent a call to lstat(), Ludovic Courtès, 2015/05/19
- 101/118: On Linux, disable address space randomization, Ludovic Courtès, 2015/05/19
- 91/118: Use regular file GC roots if possible, Ludovic Courtès, 2015/05/19
- 102/118: Remove bogus comment, Ludovic Courtès, 2015/05/19
- 80/118: Make readDirectory() return inode / file type, Ludovic Courtès, 2015/05/19
- 94/118: Doh, Ludovic Courtès, 2015/05/19
- 96/118: fix disappearing bash arguments, Ludovic Courtès, 2015/05/19
- 104/118: createDirs(): Handle ‘path’ being a symlink, Ludovic Courtès, 2015/05/19
- 103/118: nix-daemon: Close unnecessary fd, Ludovic Courtès, 2015/05/19
- 97/118: Introduce allowedRequisites feature, Ludovic Courtès, 2015/05/19