diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-04-15 22:25:58 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-04-17 00:09:16 -0400 |
| commit | e8e581bf256b8c0fbd430935af79fa0e8ee570a1 (patch) | |
| tree | b203161b3797ff9df6444c0696e402448ffbda69 /src/journal | |
| parent | c1b6628d64e5340d905d974bb95d673a4aae60c1 (diff) | |
Report about syntax errors with metadata
The information about the unit for which files are being parsed
is passed all the way down. This way messages land in the journal
with proper UNIT=... or USER_UNIT=... attribution.
'systemctl status' and 'journalctl -u' not displaying those messages
has been a source of confusion for users, since the journal entry for
a misspelt setting was often logged quite a bit earlier than the
failure to start a unit.
Based-on-a-patch-by: Oleksii Shevchuk <alxchk@gmail.com>
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journald-server.c | 2 | ||||
| -rw-r--r-- | src/journal/journald-server.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index a540fcb421..ef6189e22d 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1309,7 +1309,7 @@ static int server_parse_config_file(Server *s) { return -errno; } - r = config_parse(fn, f, "Journal\0", config_item_perf_lookup, + r = config_parse(NULL, fn, f, "Journal\0", config_item_perf_lookup, (void*) journald_gperf_lookup, false, s); if (r < 0) log_warning("Failed to parse configuration file: %s", strerror(-r)); diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h index 21edd6bdaf..fb4e8e4c3d 100644 --- a/src/journal/journald-server.h +++ b/src/journal/journald-server.h @@ -135,12 +135,12 @@ void server_driver_message(Server *s, sd_id128_t message_id, const char *format, /* gperf lookup function */ const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length); -int config_parse_storage(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +int config_parse_storage(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); const char *storage_to_string(Storage s); Storage storage_from_string(const char *s); -int config_parse_split_mode(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +int config_parse_split_mode(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); const char *split_mode_to_string(SplitMode s); SplitMode split_mode_from_string(const char *s); |