picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: rearrange conditions in unit_notify() a bit

Browse source 
This shouldn't change control flow, with one exception: we won't send
notifications for boot progress to plymouth anymore during reload, which
is something we really shouldn't.
This commit is contained in:
Lennart Poettering 2018-10-09 10:05:44 +02:00
parent d09a71356e
commit 256f65d045
1 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/core/unit.c
View file

@ -2444,43 +2444,36 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, UnitNotifyFlag
if (!(flags & UNIT_NOTIFY_WILL_AUTO_RESTART)) if (!(flags & UNIT_NOTIFY_WILL_AUTO_RESTART))
unit_start_on_failure(u); unit_start_on_failure(u);
} }
}
if (UNIT_IS_ACTIVE_OR_RELOADING(ns)) { if (UNIT_IS_ACTIVE_OR_RELOADING(ns) && !UNIT_IS_ACTIVE_OR_RELOADING(os)) {
/* This unit just finished starting up */
if (u->type == UNIT_SERVICE && if (u->type == UNIT_SERVICE) {
!UNIT_IS_ACTIVE_OR_RELOADING(os) && /* Write audit record if we have just finished starting up */
!MANAGER_IS_RELOADING(m)) { manager_send_unit_audit(m, u, AUDIT_SERVICE_START, true);
/* Write audit record if we have just finished starting up */ u->in_audit = true;
manager_send_unit_audit(m, u, AUDIT_SERVICE_START, true); }
u->in_audit = true;
manager_send_unit_plymouth(m, u);
} }
if (!UNIT_IS_ACTIVE_OR_RELOADING(os)) if (UNIT_IS_INACTIVE_OR_FAILED(ns) && !UNIT_IS_INACTIVE_OR_FAILED(os)) {
manager_send_unit_plymouth(m, u);
} else {
if (UNIT_IS_INACTIVE_OR_FAILED(ns) &&
!UNIT_IS_INACTIVE_OR_FAILED(os)
&& !MANAGER_IS_RELOADING(m)) {
/* This unit just stopped/failed. */ /* This unit just stopped/failed. */
if (u->type == UNIT_SERVICE) { if (u->type == UNIT_SERVICE) {
/* Hmm, if there was no start record written if (u->in_audit) {
* write it now, so that we always have a nice /* Write audit record if we have just finished shutting down */
* pair */ manager_send_unit_audit(m, u, AUDIT_SERVICE_STOP, ns == UNIT_INACTIVE);
if (!u->in_audit) { u->in_audit = false;
} else {
/* Hmm, if there was no start record written write it now, so that we always
* have a nice pair */
manager_send_unit_audit(m, u, AUDIT_SERVICE_START, ns == UNIT_INACTIVE); manager_send_unit_audit(m, u, AUDIT_SERVICE_START, ns == UNIT_INACTIVE);
if (ns == UNIT_INACTIVE) if (ns == UNIT_INACTIVE)
manager_send_unit_audit(m, u, AUDIT_SERVICE_STOP, true); manager_send_unit_audit(m, u, AUDIT_SERVICE_STOP, true);
} else }
/* Write audit record if we have just finished shutting down */
manager_send_unit_audit(m, u, AUDIT_SERVICE_STOP, ns == UNIT_INACTIVE);
u->in_audit = false;
} }
/* Write a log message about consumed resources */ /* Write a log message about consumed resources */