Remove "killing process <pid>" messages
They convey no useful information.
This commit is contained in:
parent
43f158bb08
commit
0ec7f47b00
|
@ -331,13 +331,9 @@ RunPager::~RunPager()
|
||||||
close(STDOUT_FILENO);
|
close(STDOUT_FILENO);
|
||||||
pid.wait();
|
pid.wait();
|
||||||
}
|
}
|
||||||
} catch (...) {
|
|
||||||
try {
|
|
||||||
pid.kill(true);
|
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
ignoreException();
|
ignoreException();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -642,7 +642,7 @@ HookInstance::~HookInstance()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
toHook.writeSide = -1;
|
toHook.writeSide = -1;
|
||||||
if (pid != -1) pid.kill(true);
|
if (pid != -1) pid.kill();
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
ignoreException();
|
ignoreException();
|
||||||
}
|
}
|
||||||
|
@ -1437,7 +1437,7 @@ void DerivationGoal::buildDone()
|
||||||
to have terminated. In fact, the builder could also have
|
to have terminated. In fact, the builder could also have
|
||||||
simply have closed its end of the pipe, so just to be sure,
|
simply have closed its end of the pipe, so just to be sure,
|
||||||
kill it. */
|
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);
|
debug(format("builder process for ‘%1%’ finished") % drvPath);
|
||||||
|
|
||||||
|
|
|
@ -678,12 +678,11 @@ Pid::operator pid_t()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int Pid::kill(bool quiet)
|
int Pid::kill()
|
||||||
{
|
{
|
||||||
assert(pid != -1);
|
assert(pid != -1);
|
||||||
|
|
||||||
if (!quiet)
|
debug(format("killing process %1%") % pid);
|
||||||
printError(format("killing process %1%") % pid);
|
|
||||||
|
|
||||||
/* Send the requested signal to the child. If it has its own
|
/* Send the requested signal to the child. If it has its own
|
||||||
process group, send the signal to every process in the child
|
process group, send the signal to every process in the child
|
||||||
|
|
|
@ -203,7 +203,7 @@ public:
|
||||||
~Pid();
|
~Pid();
|
||||||
void operator =(pid_t pid);
|
void operator =(pid_t pid);
|
||||||
operator pid_t();
|
operator pid_t();
|
||||||
int kill(bool quiet = false);
|
int kill();
|
||||||
int wait();
|
int wait();
|
||||||
|
|
||||||
void setSeparatePG(bool separatePG);
|
void setSeparatePG(bool separatePG);
|
||||||
|
|
Loading…
Reference in a new issue