|
 |
2aacef |
From 1db882cea4fe51183076d11893e9efe855310948 Mon Sep 17 00:00:00 2001
|
|
|
aa0848 |
From: Michal Sekletar <msekleta@redhat.com>
|
|
|
aa0848 |
Date: Tue, 22 Feb 2022 13:24:11 +0100
|
|
|
aa0848 |
Subject: [PATCH] core: decrease log level of messages about use of
|
|
|
aa0848 |
KillMode=none
|
|
|
aa0848 |
|
|
|
aa0848 |
RHEL-only
|
|
|
aa0848 |
|
|
|
2aacef |
Related: #2138081
|
|
|
aa0848 |
---
|
|
|
aa0848 |
src/core/load-fragment.c | 2 +-
|
|
|
aa0848 |
src/core/unit.c | 2 +-
|
|
|
aa0848 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
aa0848 |
|
|
|
aa0848 |
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
|
|
|
2aacef |
index 1a5895346d..0b5c8acee4 100644
|
|
|
aa0848 |
--- a/src/core/load-fragment.c
|
|
|
aa0848 |
+++ b/src/core/load-fragment.c
|
|
|
2aacef |
@@ -834,7 +834,7 @@ int config_parse_kill_mode(
|
|
|
aa0848 |
}
|
|
|
aa0848 |
|
|
|
aa0848 |
if (m == KILL_NONE)
|
|
|
aa0848 |
- log_syntax(unit, LOG_WARNING, filename, line, 0,
|
|
|
aa0848 |
+ log_syntax(unit, LOG_DEBUG, filename, line, 0,
|
|
|
2aacef |
"Unit uses KillMode=none. "
|
|
|
aa0848 |
"This is unsafe, as it disables systemd's process lifecycle management for the service. "
|
|
|
2aacef |
"Please update the service to use a safer KillMode=, such as 'mixed' or 'control-group'. "
|
|
|
aa0848 |
diff --git a/src/core/unit.c b/src/core/unit.c
|
|
|
2aacef |
index 5af44aaf4a..4bb7e2d498 100644
|
|
|
aa0848 |
--- a/src/core/unit.c
|
|
|
aa0848 |
+++ b/src/core/unit.c
|
|
|
2aacef |
@@ -5510,7 +5510,7 @@ int unit_log_leftover_process_start(pid_t pid, int sig, void *userdata) {
|
|
|
aa0848 |
|
|
|
aa0848 |
/* During start we print a warning */
|
|
|
aa0848 |
|
|
|
aa0848 |
- log_unit_warning(userdata,
|
|
|
aa0848 |
+ log_unit_debug(userdata,
|
|
|
aa0848 |
"Found left-over process " PID_FMT " (%s) in control group while starting unit. Ignoring.\n"
|
|
|
aa0848 |
"This usually indicates unclean termination of a previous run, or service implementation deficiencies.",
|
|
|
aa0848 |
pid, strna(comm));
|