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

Merge pull request #26794 from bluca/log_extra_fields

Browse Source 
core: append LogExtraFields= values to log_unit* messages
This commit is contained in:
Lennart Poettering
2023-03-15 09:27:47 +01:00
committed by GitHub
parent d4b6ec980d 1092e82bb7
commit 264c267686
5 changed files with 106 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/unit.h
+20 -3
View File
@@ -1078,7 +1078,13 @@ Condition *unit_find_failed_condition(Unit *u);
({ \
const Unit *_u = (unit); \
const int _l = (level); \
(log_get_max_level() < LOG_PRI(_l) || (_u && !unit_log_level_test(_u, _l))) ? -ERRNO_VALUE(error) : \
bool _do_log = !(log_get_max_level() < LOG_PRI(_l) || \
(_u && !unit_log_level_test(_u, _l))); \
const ExecContext *_c = _do_log && _u ? \
unit_get_exec_context(_u) : NULL; \
LOG_CONTEXT_PUSH_IOV(_c ? _c->log_extra_fields : NULL, \
_c ? _c->n_log_extra_fields : 0); \
!_do_log ? -ERRNO_VALUE(error) : \
_u ? log_object_internal(_l, error, PROJECT_FILE, __LINE__, __func__, _u->manager->unit_log_field, _u->id, _u->manager->invocation_log_field, _u->invocation_id_string, ##__VA_ARGS__) : \
log_internal(_l, error, PROJECT_FILE, __LINE__, __func__, ##__VA_ARGS__); \
})
@@ -1116,7 +1122,12 @@ Condition *unit_find_failed_condition(Unit *u);
({ \
const Unit *_u = (unit); \
const int _l = (level); \
unit_log_level_test(_u, _l) ? \
bool _do_log = unit_log_level_test(_u, _l); \
const ExecContext *_c = _do_log && _u ? \
unit_get_exec_context(_u) : NULL; \
LOG_CONTEXT_PUSH_IOV(_c ? _c->log_extra_fields : NULL, \
_c ? _c->n_log_extra_fields : 0); \
_do_log ? \
log_struct_errno(_l, error, __VA_ARGS__, LOG_UNIT_ID(_u)) : \
-ERRNO_VALUE(error); \
})
@@ -1125,8 +1136,14 @@ Condition *unit_find_failed_condition(Unit *u);
#define log_unit_struct_iovec_errno(unit, level, error, iovec, n_iovec) \
({ \
const Unit *_u = (unit); \
const int _l = (level); \
unit_log_level_test(unit, _l) ? \
bool _do_log = unit_log_level_test(_u, _l); \
const ExecContext *_c = _do_log && _u ? \
unit_get_exec_context(_u) : NULL; \
LOG_CONTEXT_PUSH_IOV(_c ? _c->log_extra_fields : NULL, \
_c ? _c->n_log_extra_fields : 0); \
_do_log ? \
log_struct_iovec_errno(_l, error, iovec, n_iovec) : \
-ERRNO_VALUE(error); \
})