SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log: fix order of log_unit_struct() to match other logging calls

Browse Source 
Also, while we are at it, introduce some syntactic sugar for creating
ERRNO= and MESSAGE= structured logging fields.
This commit is contained in:
Lennart Poettering
2014-11-28 02:18:46 +01:00
parent 6c861f0aef
commit e2cc6eca73
17 changed files with 153 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/conf-parser.c
+4 -4
View File
@@ -64,19 +64,19 @@ int log_syntax_internal(
error > 0 ? error : EINVAL,
file, line, func,
getpid() == 1 ? "UNIT=%s" : "USER_UNIT=%s", unit,
MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
LOG_MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
"CONFIG_FILE=%s", config_file,
"CONFIG_LINE=%u", config_line,
"MESSAGE=[%s:%u] %s", config_file, config_line, msg,
LOG_MESSAGE("[%s:%u] %s", config_file, config_line, msg),
NULL);
else
r = log_struct_internal(level,
error > 0 ? error : EINVAL,
file, line, func,
MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
LOG_MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR),
"CONFIG_FILE=%s", config_file,
"CONFIG_LINE=%u", config_line,
"MESSAGE=[%s:%u] %s", config_file, config_line, msg,
LOG_MESSAGE("[%s:%u] %s", config_file, config_line, msg),
NULL);
return r;