From af9add0e1d701cf188954f16402ef151383a2988 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 31 Jul 2024 13:11:51 +0200
Subject: [PATCH] execute: Drop log level to unit log level in exec_spawn()

All messages logged from exec_spawn() are attributed to the unit
and as such we should set the log level to the unit's max log level
for the duration of the function.

(cherry picked from commit 7881f485c9f57b1c7de4308eeab54458890c5c19)
(cherry picked from commit 4fd349953ea1d1ed580ecb94e5c0bf98c59d0fac)
---
 src/basic/log.c    |  5 ++++-
 src/basic/log.h    | 11 ++++++++++-
 src/core/execute.c |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/basic/log.c b/src/basic/log.c
index 7a443005f6f..eb2053891db 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -388,9 +388,10 @@ void log_forget_fds(void) {
         console_fd_is_tty = -1;
 }
 
-void log_set_max_level(int level) {
+int log_set_max_level(int level) {
         assert(level == LOG_NULL || (level & LOG_PRIMASK) == level);
 
+        int old = log_max_level;
         log_max_level = level;
 
         /* Also propagate max log level to libc's syslog(), just in case some other component loaded into our
@@ -403,6 +404,8 @@ void log_set_max_level(int level) {
 
         /* Ensure that our own LOG_NULL define maps sanely to the log mask */
         assert_cc(LOG_UPTO(LOG_NULL) == 0);
+
+        return old;
 }
 
 void log_set_facility(int facility) {
diff --git a/src/basic/log.h b/src/basic/log.h
index 12b310575e1..76c188dcd37 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -55,7 +55,7 @@ int log_set_target_from_string(const char *e);
 LogTarget log_get_target(void) _pure_;
 void log_settle_target(void);
 
-void log_set_max_level(int level);
+int log_set_max_level(int level);
 int log_set_max_level_from_string(const char *e);
 int log_get_max_level(void) _pure_;
 
@@ -485,6 +485,15 @@ size_t log_context_num_contexts(void);
 /* Returns the number of fields in all attached log contexts. */
 size_t log_context_num_fields(void);
 
+static inline void _reset_log_level(int *saved_log_level) {
+        assert(saved_log_level);
+
+        log_set_max_level(*saved_log_level);
+}
+
+#define LOG_CONTEXT_SET_LOG_LEVEL(level) \
+        _cleanup_(_reset_log_level) _unused_ int _saved_log_level_ = log_set_max_level(level);
+
 #define LOG_CONTEXT_PUSH(...) \
         LOG_CONTEXT_PUSH_STRV(STRV_MAKE(__VA_ARGS__))
 
diff --git a/src/core/execute.c b/src/core/execute.c
index 8dbdfcf3691..4d597bf8a60 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -377,6 +377,7 @@ int exec_spawn(Unit *unit,
         assert(!params->files_env); /* We fill this field, ensure it comes NULL-initialized to us */
 
         LOG_CONTEXT_PUSH_UNIT(unit);
+        LOG_CONTEXT_SET_LOG_LEVEL(context->log_level_max >= 0 ? context->log_level_max : log_get_max_level());
 
         r = exec_context_load_environment(unit, context, &params->files_env);
         if (r < 0)