shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

main: fix auto restarting of units after a configuration reload

Browse Source
This commit is contained in:
Lennart Poettering 2010-08-09 23:33:48 +02:00
parent 76143638fd
commit 47342320a0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fixme
View File

@ -82,8 +82,6 @@
* don't show file not found msgs for irrelevant units
* getty doesn't respawn
External:
* sysv functions should color when stdout is tty, not stdin

8
src/service.c
View File

@ -1500,7 +1500,7 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) {
s->failure = true;
if (allow_restart &&
s->allow_restart &&
!s->forbid_restart &&
(s->restart == SERVICE_RESTART_ALWAYS ||
(s->restart == SERVICE_RESTART_ON_SUCCESS && !s->failure))) {
@ -1511,6 +1511,8 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) {
} else
service_set_state(s, s->failure ? SERVICE_MAINTENANCE : SERVICE_DEAD);
s->forbid_restart = false;
return;
fail:
@ -1932,7 +1934,7 @@ static int service_start(Unit *u) {
s->failure = false;
s->main_pid_known = false;
s->allow_restart = true;
s->forbid_restart = false;
service_enter_start_pre(s);
return 0;
@ -1945,7 +1947,7 @@ static int service_stop(Unit *u) {
/* This is a user request, so don't do restarts on this
* shutdown. */
s->allow_restart = false;
s->forbid_restart = true;
/* Already on it */
if (s->state == SERVICE_STOP ||

2
src/service.h
View File

@ -115,7 +115,7 @@ struct Service {
bool failure:1;
bool main_pid_known:1;
bool bus_name_good:1;
bool allow_restart:1;
bool forbid_restart:1;
bool got_socket_fd:1;
bool sysv_has_lsb:1;
bool sysv_enabled:1;