From 0fd062edc435d9cf39022e2e92c895bf8625ad0d Mon Sep 17 00:00:00 2001

From: Michal Schmidt <mschmidt@redhat.com>

Date: Tue, 21 Jul 2015 16:15:19 +0200

Subject: [PATCH] core: do not log done failed-condition jobs as if unit

 started

It is misleading to see "Started foo." in the log when the unit's

condition was false.

(cherry picked from commit 30961fa300cad21b50fe47baee523beeadb5d0bc)

Related: #1506256

---

 src/core/job.c | 26 +++++++++++++++-----------

 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/core/job.c b/src/core/job.c

index f371f914d4..5e582b3d3c 100644

--- a/src/core/job.c

+++ b/src/core/job.c

@@ -692,13 +692,6 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) {

         assert(t >= 0);

         assert(t < _JOB_TYPE_MAX);

-        /* Reload status messages have traditionally not been printed to console. */

-        if (t == JOB_RELOAD)

-                return;

-

-        if (t == JOB_START && result == JOB_DONE && !u->condition_result)

-                return;

-

         format = job_get_status_message_format(u, t, result);

         if (!format)

                 return;

@@ -768,6 +761,19 @@ static void job_log_status_message(Unit *u, JobType t, JobResult result) {

                                 NULL);

 }

+static void job_emit_status_message(Unit *u, JobType t, JobResult result) {

+

+        /* 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_status_message(u, t, result);

+

+        /* Reload status messages have traditionally not been printed to console. */

+        if (t != JOB_RELOAD)

+                job_print_status_message(u, t, result);

+}

+

 int job_finish_and_invalidate(Job *j, JobResult result, bool recursive, bool already) {

         Unit *u;

         Unit *other;

@@ -787,10 +793,8 @@ int job_finish_and_invalidate(Job *j, JobResult result, bool recursive, bool alr

                        u->id, job_type_to_string(t), job_result_to_string(result));

         /* If this job did nothing to respective unit we don't log the status message */

-        if (!already) {

-                job_print_status_message(u, t, result);

-                job_log_status_message(u, t, result);

-        }

+        if (!already)

+                job_emit_status_message(u, t, result);

         job_add_to_dbus_queue(j);