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

service: fix auto-restart handling in service_stop()

Browse source 
When service_stop() handles a service in the SERVICE_AUTO_RESTART state,
it calls service_set_state() to transition it to the SERVICE_DEAD state.
However if the service failed, it should transition it to SERVICE_FAILED
instead, which will trigger its OnFailure units. To achieve this, we now
call service_enter_dead() in place of service_set_state(), which will
transition the service to either SERVICE_DEAD or SERVICE_FAILED as is
appropriate.

Also, some misleading comments are adjusted: service_stop() is not only
called on a user request, but also during an automatic restart in order
to handle dependencies.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=45511
This commit is contained in:
David Ward 2012-04-29 09:35:48 -04:00 committed by Lennart Poettering
parent feae8adb84
commit f0c7b229e1
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/service.c
View file

@ -2460,8 +2460,7 @@ static int service_stop(Unit *u) {
assert(s);
/* This is a user request, so don't do restarts on this
* shutdown. */
/* Don't create restart jobs from here. */
s->forbid_restart = true;
/* Already on it */
@ -2473,9 +2472,9 @@ static int service_stop(Unit *u) {
s->state == SERVICE_FINAL_SIGKILL)
return 0;
/* Don't allow a restart */
/* A restart will be scheduled or is in progress. */
if (s->state == SERVICE_AUTO_RESTART) {
service_set_state(s, SERVICE_DEAD);
service_enter_dead(s, SERVICE_SUCCESS, false);
return 0;
}