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

core: output log cycle path in one log message, not many

Browse Source 
Fixes: #35642
This commit is contained in:
Lennart Poettering
2025-06-23 16:47:06 +02:00
parent 0dc39dffbd
commit 201647e3f2
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/transaction.c
+15 -6
View File
@@ -396,13 +396,22 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
unit_ids = merge_unit_ids(unit_log_field(j->unit), array); /* ignore error */ unit_ids = merge_unit_ids(unit_log_field(j->unit), array); /* ignore error */
STRV_FOREACH_PAIR(unit_id, job_type, array) size_t m = strv_length(array);
/* logging for j not k here to provide a consistent narrative */
_cleanup_free_ char *cycle_path_text = strdup("Found ordering cycle");
if (m > 0) {
(void) strextendf(&cycle_path_text, " on %s/%s", array[0], array[1]);
if (m > 2)
(void) strextendf(&cycle_path_text, "; has dependency on %s/%s", array[2], array[3]);
}
STRV_FOREACH_PAIR(unit_id, job_type, strv_skip(array, 4))
(void) strextendf(&cycle_path_text, ", %s/%s", *unit_id, *job_type);
/* logging for j not k here to provide a consistent narrative */
if (cycle_path_text)
log_struct(LOG_WARNING, log_struct(LOG_WARNING,
LOG_UNIT_MESSAGE(j->unit, LOG_UNIT_MESSAGE(j->unit, "%s", cycle_path_text),
"Found %s on %s/%s",
unit_id == array ? "ordering cycle" : "dependency",
*unit_id, *job_type),
LOG_ITEM("%s", strna(unit_ids))); LOG_ITEM("%s", strna(unit_ids)));
if (delete) { if (delete) {