naccyde / rpms / systemd

Forked from rpms/systemd a year ago
Clone
aa0848
From 16c4a3c3a826d03f60db83c8d6d809d59e6f38ad 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
aa0848
Resolves: #2013213
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
aa0848
index 92a52819e2..ad5a0912fc 100644
aa0848
--- a/src/core/load-fragment.c
aa0848
+++ b/src/core/load-fragment.c
aa0848
@@ -816,7 +816,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,
aa0848
                            "Unit configured to use KillMode=none. "
aa0848
                            "This is unsafe, as it disables systemd's process lifecycle management for the service. "
aa0848
                            "Please update your 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
aa0848
index d2adb447b6..9cbed08987 100644
aa0848
--- a/src/core/unit.c
aa0848
+++ b/src/core/unit.c
aa0848
@@ -5458,7 +5458,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));