summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2013-07-25 14:07:59 +0200
committerLennart Poettering <lennart@poettering.net>2013-09-12 18:29:44 +0200
commitdc99a9764418a1974c46c55efa73b034f530a5a5 (patch)
treeb74c9e03549e3cfdde0ed41752b79033e1824344 /src
parent00a168618906bea43c3c57e20b9152582c324bf8 (diff)
service: Implement 'on-watchdog' restart option
Services using the watchdog option might want to be restarted only if the watchdog triggers.
Diffstat (limited to 'src')
-rw-r--r--src/core/service.c2
-rw-r--r--src/core/service.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/core/service.c b/src/core/service.c
index 34dde7963e..08b929e4fe 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1937,6 +1937,7 @@ static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart)
(s->restart == SERVICE_RESTART_ALWAYS ||
(s->restart == SERVICE_RESTART_ON_SUCCESS && s->result == SERVICE_SUCCESS) ||
(s->restart == SERVICE_RESTART_ON_FAILURE && s->result != SERVICE_SUCCESS) ||
+ (s->restart == SERVICE_RESTART_ON_WATCHDOG && s->result == SERVICE_FAILURE_WATCHDOG) ||
(s->restart == SERVICE_RESTART_ON_ABORT && (s->result == SERVICE_FAILURE_SIGNAL ||
s->result == SERVICE_FAILURE_CORE_DUMP))) &&
(s->result != SERVICE_FAILURE_EXIT_CODE ||
@@ -3791,6 +3792,7 @@ static const char* const service_restart_table[_SERVICE_RESTART_MAX] = {
[SERVICE_RESTART_NO] = "no",
[SERVICE_RESTART_ON_SUCCESS] = "on-success",
[SERVICE_RESTART_ON_FAILURE] = "on-failure",
+ [SERVICE_RESTART_ON_WATCHDOG] = "on-watchdog",
[SERVICE_RESTART_ON_ABORT] = "on-abort",
[SERVICE_RESTART_ALWAYS] = "always"
};
diff --git a/src/core/service.h b/src/core/service.h
index 182cba1333..ce5b5e04ab 100644
--- a/src/core/service.h
+++ b/src/core/service.h
@@ -54,6 +54,7 @@ typedef enum ServiceRestart {
SERVICE_RESTART_NO,
SERVICE_RESTART_ON_SUCCESS,
SERVICE_RESTART_ON_FAILURE,
+ SERVICE_RESTART_ON_WATCHDOG,
SERVICE_RESTART_ON_ABORT,
SERVICE_RESTART_ALWAYS,
_SERVICE_RESTART_MAX,