aleksanaa/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Get rid of "killing <pid>" message for unused build hooks

Browse source
This commit is contained in:
Eelco Dolstra 2014-08-04 17:27:45 +02:00
parent bb45092f72
commit 4d73e2e893
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build.cc
View file

@ -623,7 +623,7 @@ HookInstance::HookInstance()
HookInstance::~HookInstance() HookInstance::~HookInstance()
{ {
try { try {
pid.kill(); pid.kill(true);
} catch (...) { } catch (...) {
ignoreException(); ignoreException();
} }

3
src/libutil/util.cc
View file

@ -740,10 +740,11 @@ Pid::operator pid_t()
} }
void Pid::kill() void Pid::kill(bool quiet)
{ {
if (pid == -1 || pid == 0) return; if (pid == -1 || pid == 0) return;
if (!quiet)
printMsg(lvlError, format("killing process %1%") % pid); printMsg(lvlError, 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

2
src/libutil/util.hh
View file

@ -253,7 +253,7 @@ public:
~Pid(); ~Pid();
void operator =(pid_t pid); void operator =(pid_t pid);
operator pid_t(); operator pid_t();
void kill(); void kill(bool quiet = false);
int wait(bool block); int wait(bool block);
void setSeparatePG(bool separatePG); void setSeparatePG(bool separatePG);
void setKillSignal(int signal); void setKillSignal(int signal);