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

core: do not log done failed-condition jobs as if unit started

Browse Source 
It is misleading to see "Started foo." in the log when the unit's
condition was false.
This commit is contained in:
Michal Schmidt
2015-07-21 19:24:20 +02:00
parent c382d69e3d
commit 30961fa300
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/job.c
+14 -9
View File
@@ -683,13 +683,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;
@@ -759,6 +752,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);
}
static void job_fail_dependencies(Unit *u, UnitDependency d) {
Unit *other;
Iterator i;
@@ -794,8 +800,7 @@ int job_finish_and_invalidate(Job *j, JobResult result, bool recursive) {
log_unit_debug(u, "Job %s/%s finished, result=%s", u->id, job_type_to_string(t), job_result_to_string(result));
job_print_status_message(u, t, result);
job_log_status_message(u, t, result);
job_emit_status_message(u, t, result);
job_add_to_dbus_queue(j);