guix-commits
[Top][All Lists]
Advanced

[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();



reply via email to

[Prev in Thread] Current Thread [Next in Thread]