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

service: honour that for services RestartSec=0 means immediate restarts but TimeoutSec= means no timing out at all

Browse Source
This commit is contained in:
Lennart Poettering
2013-11-22 19:27:56 +01:00
parent 66ca4ec48a
commit 92c1622e14
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/service.c
+24 -16
View File
@@ -346,11 +346,6 @@ static int service_arm_timer(Service *s, usec_t usec) {
assert(s);
if (usec <= 0) {
s->timer_event_source = sd_event_source_unref(s->timer_event_source);
return 0;
}
if (s->timer_event_source) {
r = sd_event_source_set_time(s->timer_event_source, now(CLOCK_MONOTONIC) + usec);
if (r < 0)
@@ -1597,21 +1592,30 @@ static int service_coldplug(Unit *u) {
s->deserialized_state == SERVICE_STOP_SIGKILL ||
s->deserialized_state == SERVICE_STOP_POST ||
s->deserialized_state == SERVICE_FINAL_SIGTERM ||
s->deserialized_state == SERVICE_FINAL_SIGKILL ||
s->deserialized_state == SERVICE_AUTO_RESTART) {
s->deserialized_state == SERVICE_FINAL_SIGKILL) {
if (s->deserialized_state == SERVICE_AUTO_RESTART || s->timeout_start_usec > 0) {
usec_t k;
r = service_arm_timer(s,
s->deserialized_state == SERVICE_AUTO_RESTART ? s->restart_usec :
s->deserialized_state == SERVICE_START_PRE || s->deserialized_state == SERVICE_START ||
s->deserialized_state == SERVICE_START_POST || s->deserialized_state == SERVICE_RELOAD ? s->timeout_start_usec :
s->timeout_stop_usec);
k = s->deserialized_state == SERVICE_START_PRE || s->deserialized_state == SERVICE_START ||
s->deserialized_state == SERVICE_START_POST || s->deserialized_state == SERVICE_RELOAD ?
s->timeout_start_usec : s->timeout_stop_usec;
/* For the start/stop timeouts 0 means off */
if (k > 0) {
r = service_arm_timer(s, k);
if (r < 0)
return r;
}
}
if (s->deserialized_state == SERVICE_AUTO_RESTART) {
/* The restart timeouts 0 means immediately */
r = service_arm_timer(s, s->restart_usec);
if (r < 0)
return r;
}
if ((s->deserialized_state == SERVICE_START &&
(s->type == SERVICE_FORKING ||
s->type == SERVICE_DBUS ||
@@ -1651,6 +1655,7 @@ static int service_coldplug(Unit *u) {
service_set_state(s, s->deserialized_state);
}
return 0;
}
@@ -1763,9 +1768,12 @@ static int service_spawn(
}
}
r = service_arm_timer(s, timeout ? s->timeout_start_usec : 0);
if (r < 0)
goto fail;
if (timeout && s->timeout_start_usec > 0) {
r = service_arm_timer(s, s->timeout_start_usec);
if (r < 0)
goto fail;
} else
s->timer_event_source = sd_event_source_unref(s->timer_event_source);
r = unit_full_printf_strv(UNIT(s), c->argv, &argv);
if (r < 0)