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

log: don't print function name with INFO logs

Browse Source
This commit is contained in:
Robert Swiecki 2016-10-17 15:49:20 +02:00
parent b1ca8dd1b5
commit d0a3edd67f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
log.c
View File

@ -84,7 +84,7 @@ void logLog(enum llevel_t ll, const char *fn, int ln, bool perr, const char *fmt
{"HR", "\033[0m", false},
{"HB", "\033[1m", false},
{"D", "\033[0;4m", true},
{"I", "\033[1m", true},
{"I", "\033[1m", false},
{"W", "\033[0;33m", true},
{"E", "\033[1;31m", true},
{"F", "\033[7;35m", true},

6
subproc.c
View File

@ -249,8 +249,10 @@ int subprocReap(struct nsjconf_t *nsjconf)
if (diff >= nsjconf->tlimit) {
LOG_I("PID: %d run time >= time limit (%ld >= %ld) (%s). Killing it", pid,
(long)diff, (long)nsjconf->tlimit, p->remote_txt);
/* Probably a kernel bug - some processes cannot be killed with KILL if
* they're namespaced, and in a stopped state */
/*
* Probably a kernel bug - some processes cannot be killed with KILL if
* they're namespaced, and in a stopped state
*/
kill(pid, SIGCONT);
PLOG_D("Sent SIGCONT to PID: %d", pid);
kill(pid, SIGKILL);