picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

environment: append unit_id to error messages regarding EnvironmentFile

Browse source
This commit is contained in:
Lukas Nykryn 2014-10-17 11:46:01 +02:00
parent c7e4a7bece
commit 7491ccf2cb
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/execute.c
View file

@ -1785,7 +1785,7 @@ int exec_spawn(ExecCommand *command,
n_fds = params->n_fds;
}
err = exec_context_load_environment(context, &files_env);
err = exec_context_load_environment(context, params->unit_id, &files_env);
if (err < 0) {
log_struct_unit(LOG_ERR,
params->unit_id,
@ -2014,7 +2014,7 @@ void exec_command_free_array(ExecCommand **c, unsigned n) {
}
}
int exec_context_load_environment(const ExecContext *c, char ***l) {
int exec_context_load_environment(const ExecContext *c, const char *unit_id, char ***l) {
char **i, **r = NULL;
assert(c);
@ -2071,7 +2071,7 @@ int exec_context_load_environment(const ExecContext *c, char ***l) {
}
/* Log invalid environment variables with filename */
if (p)
p = strv_env_clean_log(p, pglob.gl_pathv[n]);
p = strv_env_clean_log(p, unit_id, pglob.gl_pathv[n]);
if (r == NULL)
r = p;

2
src/core/execute.h
View file

@ -241,7 +241,7 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix);
int exec_context_destroy_runtime_directory(ExecContext *c, const char *runtime_root);
int exec_context_load_environment(const ExecContext *c, char ***l);
int exec_context_load_environment(const ExecContext *c, const char *unit_id, char ***l);
bool exec_context_may_touch_console(ExecContext *c);

7
src/shared/env-util.c
View file

@ -28,6 +28,7 @@
#include "util.h"
#include "env-util.h"
#include "def.h"
#include "unit.h"
#define VALID_CHARS_ENV_NAME \
DIGITS LETTERS \
@ -414,7 +415,7 @@ char *strv_env_get(char **l, const char *name) {
return strv_env_get_n(l, name, strlen(name));
}
char **strv_env_clean_log(char **e, const char *message) {
char **strv_env_clean_log(char **e, const char *unit_id, const char *message) {
char **p, **q;
int k = 0;
@ -424,7 +425,7 @@ char **strv_env_clean_log(char **e, const char *message) {
if (!env_assignment_is_valid(*p)) {
if (message)
log_error("Ignoring invalid environment '%s': %s", *p, message);
log_error_unit(unit_id, "Ignoring invalid environment '%s': %s", *p, message);
free(*p);
continue;
}
@ -451,5 +452,5 @@ char **strv_env_clean_log(char **e, const char *message) {
}
char **strv_env_clean(char **e) {
return strv_env_clean_log(e, NULL);
return strv_env_clean_log(e, NULL, NULL);
}

2
src/shared/env-util.h
View file

@ -30,7 +30,7 @@ bool env_assignment_is_valid(const char *e);
bool strv_env_is_valid(char **e);
char **strv_env_clean(char **l);
char **strv_env_clean_log(char **e, const char *message);
char **strv_env_clean_log(char **e, const char *unit_id, const char *message);
bool strv_env_name_or_assignment_is_valid(char **l);

2
src/test/test-fileio.c
View file

@ -90,7 +90,7 @@ static void test_parse_env_file(void) {
assert_se(streq_ptr(a[9], "ten="));
assert_se(a[10] == NULL);
strv_env_clean_log(a, "test");
strv_env_clean_log(a, NULL, "test");
k = 0;
STRV_FOREACH(i, b) {