[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
140/376: Make hook shutdown more reliable
From: |
Ludovic Courtès |
Subject: |
140/376: Make hook shutdown more reliable |
Date: |
Wed, 28 Jan 2015 22:04:35 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 029424d17d0860e4423bbd409f22104f55ea65e0
Author: Eelco Dolstra <address@hidden>
Date: Tue Aug 19 17:44:59 2014 +0200
Make hook shutdown more reliable
---
src/libstore/build.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 232059e..aa539a1 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -617,7 +617,6 @@ HookInstance::HookInstance()
});
pid.setSeparatePG(true);
- pid.setKillSignal(SIGTERM);
fromHook.writeSide.close();
toHook.readSide.close();
}
@@ -626,6 +625,7 @@ HookInstance::HookInstance()
HookInstance::~HookInstance()
{
try {
+ toHook.writeSide.close();
pid.kill(true);
} catch (...) {
ignoreException();
- 133/376: Fix download-via-ssh, (continued)
- 133/376: Fix download-via-ssh, Ludovic Courtès, 2015/01/28
- 130/376: nix-log2xml: Handle newlines, Ludovic Courtès, 2015/01/28
- 143/376: nix-store -l: Automatically pipe output into $PAGER, Ludovic Courtès, 2015/01/28
- 139/376: Fix --attr parsing, Ludovic Courtès, 2015/01/28
- 142/376: Reduce test verbosity, Ludovic Courtès, 2015/01/28
- 138/376: Doh, Ludovic Courtès, 2015/01/28
- 135/376: nix-build: Propagate exit status from nix-store -r, Ludovic Courtès, 2015/01/28
- 125/376: Refactor option handling, Ludovic Courtès, 2015/01/28
- 134/376: build-remote.pl: Provide defaults for $NIX_CURRENT_LOAD and $NIX_REMOTE_SYSTEMS, Ludovic Courtès, 2015/01/28
- 141/376: Filter Nix-specific ANSI escape sequences from stderr, Ludovic Courtès, 2015/01/28
- 140/376: Make hook shutdown more reliable,
Ludovic Courtès <=
- 144/376: Add some color, Ludovic Courtès, 2015/01/28
- 147/376: Handle header file instantiation, Ludovic Courtès, 2015/01/28
- 152/376: Flush std::cout before closing stdout, Ludovic Courtès, 2015/01/28
- 146/376: Install config.h only once, Ludovic Courtès, 2015/01/28
- 148/376: Force template regeneration, Ludovic Courtès, 2015/01/28
- 158/376: fix disappearing bash arguments, Ludovic Courtès, 2015/01/28
- 150/376: Provide reasonable default flags for $LESS, Ludovic Courtès, 2015/01/28
- 149/376: Merge commit '2aa93858afee22e0c32d8f4366970976374091ac', Ludovic Courtès, 2015/01/28
- 156/376: Use PR_SET_PDEATHSIG to ensure child cleanup, Ludovic Courtès, 2015/01/28
- 155/376: Set a curl timeout on binary cache lookups, Ludovic Courtès, 2015/01/28