diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2017-03-16 10:52:28 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2017-03-16 10:52:28 +0100 |
commit | 0ec7f47b00659cf043eb7fbe72385a08f7e9f8e2 (patch) | |
tree | 820dd15bf3c739616b177e7d8279997622e74822 /src | |
parent | 43f158bb0885c2eb9180ef7ab24034b1b9353e8b (diff) |
Remove "killing process <pid>" messages
They convey no useful information.
Diffstat (limited to 'src')
-rw-r--r-- | src/libmain/shared.cc | 6 | ||||
-rw-r--r-- | src/libstore/build.cc | 4 | ||||
-rw-r--r-- | src/libutil/util.cc | 5 | ||||
-rw-r--r-- | src/libutil/util.hh | 2 |
4 files changed, 6 insertions, 11 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index 326202d29..a720afd6c 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -332,11 +332,7 @@ RunPager::~RunPager() pid.wait(); } } catch (...) { - try { - pid.kill(true); - } catch (...) { - ignoreException(); - } + ignoreException(); } } diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 2b0f8e592..fc840df81 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -642,7 +642,7 @@ HookInstance::~HookInstance() { try { toHook.writeSide = -1; - if (pid != -1) pid.kill(true); + if (pid != -1) pid.kill(); } catch (...) { ignoreException(); } @@ -1437,7 +1437,7 @@ void DerivationGoal::buildDone() to have terminated. In fact, the builder could also have simply have closed its end of the pipe, so just to be sure, kill it. */ - int status = hook ? hook->pid.kill(true) : pid.kill(true); + int status = hook ? hook->pid.kill() : pid.kill(); debug(format("builder process for ‘%1%’ finished") % drvPath); diff --git a/src/libutil/util.cc b/src/libutil/util.cc index d2d32782d..99a91c8cc 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -678,12 +678,11 @@ Pid::operator pid_t() } -int Pid::kill(bool quiet) +int Pid::kill() { assert(pid != -1); - if (!quiet) - printError(format("killing process %1%") % pid); + debug(format("killing process %1%") % pid); /* Send the requested signal to the child. If it has its own process group, send the signal to every process in the child diff --git a/src/libutil/util.hh b/src/libutil/util.hh index 4e3a011b3..f94c0ff1c 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -203,7 +203,7 @@ public: ~Pid(); void operator =(pid_t pid); operator pid_t(); - int kill(bool quiet = false); + int kill(); int wait(); void setSeparatePG(bool separatePG); |