diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-10-08 18:34:54 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-10-08 18:34:54 +0200 |
| commit | 50caaedb2c416c8972f9b2f835a69a20c524e81e (patch) | |
| tree | 4f0380efa907f3ab5c9b3699095494de4af3eab0 /src | |
| parent | c84ed68f304b22606f874118e6eb32f7089b1699 (diff) | |
service: introduce Restart=on-failure and Restart=on-abort
Diffstat (limited to 'src')
| -rw-r--r-- | src/service.c | 10 | ||||
| -rw-r--r-- | src/service.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/service.c b/src/service.c index 04496a2dd2..d3852c76a1 100644 --- a/src/service.c +++ b/src/service.c @@ -1627,7 +1627,11 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) { if (allow_restart && !s->forbid_restart && (s->restart == SERVICE_RESTART_ALWAYS || - (s->restart == SERVICE_RESTART_ON_SUCCESS && !s->failure))) { + (s->restart == SERVICE_RESTART_ON_SUCCESS && !s->failure) || + (s->restart == SERVICE_RESTART_ON_FAILURE && s->failure) || + (s->restart == SERVICE_RESTART_ON_ABORT && s->failure && + (s->main_exec_status.code == CLD_KILLED || + s->main_exec_status.code == CLD_DUMPED)))) { if ((r = unit_watch_timer(UNIT(s), s->restart_usec, &s->timer_watch)) < 0) goto fail; @@ -3115,7 +3119,9 @@ DEFINE_STRING_TABLE_LOOKUP(service_state, ServiceState); static const char* const service_restart_table[_SERVICE_RESTART_MAX] = { [SERVICE_RESTART_NO] = "no", [SERVICE_RESTART_ON_SUCCESS] = "on-success", - [SERVICE_RESTART_ALWAYS] = "always", + [SERVICE_RESTART_ON_FAILURE] = "on-failure", + [SERVICE_RESTART_ON_ABORT] = "on-abort", + [SERVICE_RESTART_ALWAYS] = "always" }; DEFINE_STRING_TABLE_LOOKUP(service_restart, ServiceRestart); diff --git a/src/service.h b/src/service.h index f47346702f..eb44a43895 100644 --- a/src/service.h +++ b/src/service.h @@ -50,6 +50,8 @@ typedef enum ServiceState { typedef enum ServiceRestart { SERVICE_RESTART_NO, SERVICE_RESTART_ON_SUCCESS, + SERVICE_RESTART_ON_FAILURE, + SERVICE_RESTART_ON_ABORT, SERVICE_RESTART_ALWAYS, _SERVICE_RESTART_MAX, _SERVICE_RESTART_INVALID = -1 |