naccyde / rpms / systemd

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