service: introduce a proper service result if the start limit is hit

diff --git a/TODO b/TODO
index ee90aee7395d015ce6b85b17ba5069c3fc70e0f0..c70a53c132e523ba5fdfc692334191895562212a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -55,8 +55,6 @@ Features:
 
 * enforce limits on fds openened by socket units
 
-* proper service failure code for services which hit the restart limit
-
 * explore multiple service instances per listening socket idea
 
 * testing tool for socket activation: some binary that listens on a socket and passes it on using the usual socket activation protocol to some server.
@@ -237,8 +235,6 @@ Features:
 
 * Add pretty name for seats in logind
 
-* nspawn wants dev_setup() for /dev/fd/ and friends?
-
 * selinux: merge systemd selinux access controls (dwalsh)
 
 * ConditionSecurity= should learn about IMA

diff --git a/src/core/service.c b/src/core/service.c
index f540752b61f6d044d594514fe3a8138cf2dc3825..807b34267f19622eaf984a82acd3a5abc4e7e6b4 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2508,7 +2508,7 @@ static int service_start(Unit *u) {
         /* Make sure we don't enter a busy loop of some kind. */
         r = service_start_limit_test(s);
         if (r < 0) {
-                service_notify_sockets_dead(s, true);
+                service_enter_dead(s, SERVICE_FAILURE_START_LIMIT, false);
                 return r;
         }
 
@@ -3821,7 +3821,8 @@ static const char* const service_result_table[_SERVICE_RESULT_MAX] = {
         [SERVICE_FAILURE_EXIT_CODE] = "exit-code",
         [SERVICE_FAILURE_SIGNAL] = "signal",
         [SERVICE_FAILURE_CORE_DUMP] = "core-dump",
-        [SERVICE_FAILURE_WATCHDOG] = "watchdog"
+        [SERVICE_FAILURE_WATCHDOG] = "watchdog",
+        [SERVICE_FAILURE_START_LIMIT] = "start-limit"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(service_result, ServiceResult);

diff --git a/src/core/service.h b/src/core/service.h
index 2a4dc30d0b39b1e3a748375ac5dd4487aa9086f1..d1e53bf727fa0a97ffc1b848659ca085f8be398b 100644 (file)
--- a/src/core/service.h
+++ b/src/core/service.h
@@ -98,6 +98,7 @@ typedef enum ServiceResult {
         SERVICE_FAILURE_SIGNAL,
         SERVICE_FAILURE_CORE_DUMP,
         SERVICE_FAILURE_WATCHDOG,
+        SERVICE_FAILURE_START_LIMIT,
         _SERVICE_RESULT_MAX,
         _SERVICE_RESULT_INVALID = -1
 } ServiceResult;