woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print remote IP when removing task from pool

Browse Source
This commit is contained in:
Robert Swiecki 2017-06-19 18:53:29 +02:00
parent ee60565462
commit e7b3be206a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
subproc.c
View File

@ -303,19 +303,28 @@ int subprocReap(struct nsjconf_t *nsjconf)
if (wait4(si.si_pid, &status, WNOHANG, NULL) == si.si_pid) {
cgroupFinishFromParent(nsjconf, si.si_pid);
const char *remote_txt = "[UNKNOWN]";
struct pids_t *elem = subprocGetPidElem(nsjconf, si.si_pid);
if (elem) {
remote_txt = elem->remote_txt;
}
if (WIFEXITED(status)) {
LOG_I("PID: %d (%s) exited with status: %d, (PIDs left: %d)",
si.si_pid, remote_txt, WEXITSTATUS(status),
subprocCount(nsjconf) - 1);
subprocRemove(nsjconf, si.si_pid);
LOG_I("PID: %d exited with status: %d, (PIDs left: %d)", si.si_pid,
WEXITSTATUS(status), subprocCount(nsjconf));
rv = WEXITSTATUS(status) % 100;
if (rv == 0 && WEXITSTATUS(status) != 0) {
rv = 1;
}
}
if (WIFSIGNALED(status)) {
LOG_I("PID: %d (%s) terminated with signal: %d, (PIDs left: %d)",
si.si_pid, remote_txt, WTERMSIG(status),
subprocCount(nsjconf) - 1);
subprocRemove(nsjconf, si.si_pid);
LOG_I("PID: %d terminated with signal: %d, (PIDs left: %d)",
si.si_pid, WTERMSIG(status), subprocCount(nsjconf));
rv = 100 + WTERMSIG(status);
}
}