From 83b4576195da3167d78d5d7e13800c32799efca5 Mon Sep 17 00:00:00 2001 From: Adrian Vovk Date: Fri, 19 Jan 2024 19:46:07 -0500 Subject: [PATCH] env-util: Add helper to store current log level This is useful after a fork but before an exec into a binary that uses systemd's logging utilities. For example, this should be used in dbus services that fork off worker processes: currently, the log level set by the LogControl dbus API will be lost because of the exec, and the worker process will not have the correct log level set. --- src/basic/env-util.c | 12 ++++++++++++ src/basic/env-util.h | 1 + 2 files changed, 13 insertions(+) diff --git a/src/basic/env-util.c b/src/basic/env-util.c index 6061edb904..b96fbdff48 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -18,6 +18,7 @@ #include "stdio-util.h" #include "string-util.h" #include "strv.h" +#include "syslog-util.h" #include "utf8.h" /* We follow bash for the character set. Different shells have different rules. */ @@ -1030,6 +1031,17 @@ int setenv_systemd_exec_pid(bool update_only) { return 1; } +int setenv_systemd_log_level(void) { + _cleanup_free_ char *val = NULL; + int r; + + r = log_level_to_string_alloc(log_get_max_level(), &val); + if (r < 0) + return r; + + return RET_NERRNO(setenv("SYSTEMD_LOG_LEVEL", val, /* overwrite= */ true)); +} + int getenv_path_list(const char *name, char ***ret_paths) { _cleanup_strv_free_ char **l = NULL; const char *e; diff --git a/src/basic/env-util.h b/src/basic/env-util.h index ad127de39f..31680b160c 100644 --- a/src/basic/env-util.h +++ b/src/basic/env-util.h @@ -72,6 +72,7 @@ int set_unset_env(const char *name, const char *value, bool overwrite); int putenv_dup(const char *assignment, bool override); int setenv_systemd_exec_pid(bool update_only); +int setenv_systemd_log_level(void); /* Parses and does sanity checks on an environment variable containing * PATH-like colon-separated absolute paths */