From f6301bdc81c7aca37fb21da877900ad0f9fbd49c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 26 Aug 2019 22:53:01 +0200 Subject: [PATCH] environment-d-generator: output logs in debug mode Those codepaths is only used by that generator, so simply adding a few debug log lines should be OK. Fixes #12259. --- src/basic/env-file.c | 2 ++ src/environment-d-generator/environment-d-generator.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/src/basic/env-file.c b/src/basic/env-file.c index 83767b0a24a..26470796eb9 100644 --- a/src/basic/env-file.c +++ b/src/basic/env-file.c @@ -485,6 +485,8 @@ static int merge_env_file_push( free_and_replace(value, expanded_value); + log_debug("%s:%u: setting %s=%s", filename, line, key, value); + return load_env_file_push(filename, line, key, value, env, n_pushed); } diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c index d1293eff168..5fe51359f60 100644 --- a/src/environment-d-generator/environment-d-generator.c +++ b/src/environment-d-generator/environment-d-generator.c @@ -28,6 +28,13 @@ static int environment_dirs(char ***ret) { if (r < 0) return r; + if (DEBUG_LOGGING) { + _cleanup_free_ char *t; + + t = strv_join(dirs, "\n\t"); + log_debug("Looking for environment.d files in (higher priority first):\n\t%s", strna(t)); + } + *ret = TAKE_PTR(dirs); return 0; } @@ -49,6 +56,8 @@ static int load_and_print(void) { * that in case of failure, a partial update is better than none. */ STRV_FOREACH(i, files) { + log_debug("Reading %s…", *i); + r = merge_env_file(&env, NULL, *i); if (r == -ENOMEM) return r; -- 2.47.3