You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
systemd/SOURCES/0377-job-when-a-job-was-ski...

64 lines
2.6 KiB

From 9c543783dbe560f4dafa4c2f276e03a4bce0389e Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 14 Nov 2018 11:08:16 +0100
Subject: [PATCH] job: when a job was skipped due to a failed condition, log
about it
Previously we'd neither show console status output nor log output. Let's
fix that, and still log something.
(cherry picked from commit 9a80f2f4533883d272e6a436512aa7e88cedc549)
Related: #1737283
---
src/core/job.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/core/job.c b/src/core/job.c
index 561ea14682..b9eee91cf3 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -810,6 +810,10 @@ static void job_print_done_status_message(Unit *u, JobType t, JobResult result)
if (t == JOB_RELOAD)
return;
+ /* No message if the job did not actually do anything due to failed condition. */
+ if (t == JOB_START && result == JOB_DONE && !u->condition_result)
+ return;
+
if (!job_print_done_status_messages[result].word)
return;
@@ -865,6 +869,20 @@ static void job_log_done_status_message(Unit *u, uint32_t job_id, JobType t, Job
if (log_on_console() && job_print_done_status_messages[result].word)
return;
+ /* Show condition check message if the job did not actually do anything due to failed condition. */
+ if (t == JOB_START && result == JOB_DONE && !u->condition_result) {
+ log_struct(LOG_INFO,
+ "MESSAGE=Condition check resulted in %s being skipped.", unit_description(u),
+ "JOB_ID=%" PRIu32, job_id,
+ "JOB_TYPE=%s", job_type_to_string(t),
+ "JOB_RESULT=%s", job_result_to_string(result),
+ LOG_UNIT_ID(u),
+ LOG_UNIT_INVOCATION_ID(u),
+ "MESSAGE_ID=" SD_MESSAGE_UNIT_STARTED_STR);
+
+ return;
+ }
+
format = job_get_done_status_message_format(u, t, result);
if (!format)
return;
@@ -917,10 +935,6 @@ static void job_log_done_status_message(Unit *u, uint32_t job_id, JobType t, Job
static void job_emit_done_status_message(Unit *u, uint32_t job_id, JobType t, JobResult result) {
assert(u);
- /* No message if the job did not actually do anything due to failed condition. */
- if (t == JOB_START && result == JOB_DONE && !u->condition_result)
- return;
-
job_log_done_status_message(u, job_id, t, result);
job_print_done_status_message(u, t, result);
}