dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-24 16:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

killall: bump log message about unkilled processes to LOG_WARNING

Browse Source 
By raising this, we can raise the kernel kmsg log level safely, and
still see these messages.
This commit is contained in:
Lennart Poettering
2019-07-12 10:24:00 +02:00
parent b65011dad0
commit 60cd367649
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/killall.c
View File

@@ -78,27 +78,30 @@ static bool ignore_proc(pid_t pid, bool warn_rootfs) {
}
static void log_children_no_yet_killed(Set *pids) {
void *p;
Iterator i;
_cleanup_free_ char *lst_child = NULL;
Iterator i;
void *p;
SET_FOREACH(p, pids, i) {
_cleanup_free_ char *s = NULL;
if (get_process_comm(PTR_TO_PID(p), &s) == 0) {
if (!strextend(&lst_child, ", ", s, NULL))
break;
if (get_process_comm(PTR_TO_PID(p), &s) < 0)
(void) asprintf(&s, PID_FMT, PTR_TO_PID(p));
if (!strextend(&lst_child, ", ", s, NULL)) {
log_oom();
return;
}
}
if (!isempty(lst_child))
log_notice("Waiting for process:%s", lst_child + 1);
if (isempty(lst_child))
return;
log_warning("Waiting for process: %s", lst_child + 2);
}
static int wait_for_children(Set *pids, sigset_t *mask, usec_t timeout) {
usec_t until;
usec_t date_log_child;
usec_t n;
usec_t until, date_log_child, n;
assert(mask);