|
 |
ff2b41 |
From c460203ad5165dfb095fcfaa6646708e39d2080e Mon Sep 17 00:00:00 2001
|
|
|
ff2b41 |
From: Jouke Witteveen <j.witteveen@gmail.com>
|
|
|
ff2b41 |
Date: Tue, 22 Nov 2016 17:39:56 +0100
|
|
|
ff2b41 |
Subject: [PATCH] service: introduce protocol error type
|
|
|
ff2b41 |
|
|
|
ff2b41 |
Introduce a SERVICE_FAILURE_PROTOCOL error type for when a service does
|
|
|
ff2b41 |
not follow the protocol.
|
|
|
ff2b41 |
This error type is used when a pid file is expected, but not delivered.
|
|
|
ff2b41 |
|
|
|
ff2b41 |
(cherry picked from commit c35755fb878af58b80ac62a501a75f79c90a3763)
|
|
|
ff2b41 |
|
|
|
ff2b41 |
Related: #1733998
|
|
|
ff2b41 |
---
|
|
|
ff2b41 |
src/core/service.c | 9 +++++----
|
|
|
ff2b41 |
src/core/service.h | 1 +
|
|
|
ff2b41 |
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
ff2b41 |
|
|
|
ff2b41 |
diff --git a/src/core/service.c b/src/core/service.c
|
|
|
ff2b41 |
index ea71c9e237..84a5aeb072 100644
|
|
|
ff2b41 |
--- a/src/core/service.c
|
|
|
ff2b41 |
+++ b/src/core/service.c
|
|
|
ff2b41 |
@@ -2568,9 +2568,9 @@ static void service_notify_cgroup_empty_event(Unit *u) {
|
|
|
ff2b41 |
|
|
|
ff2b41 |
service_unwatch_pid_file(s);
|
|
|
ff2b41 |
if (s->state == SERVICE_START)
|
|
|
ff2b41 |
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
|
|
|
ff2b41 |
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_PROTOCOL);
|
|
|
ff2b41 |
else
|
|
|
ff2b41 |
- service_enter_stop(s, SERVICE_FAILURE_RESOURCES);
|
|
|
ff2b41 |
+ service_enter_stop(s, SERVICE_FAILURE_PROTOCOL);
|
|
|
ff2b41 |
}
|
|
|
ff2b41 |
break;
|
|
|
ff2b41 |
|
|
|
ff2b41 |
@@ -2804,7 +2804,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
|
|
|
ff2b41 |
if (!has_start_post && r < 0) {
|
|
|
ff2b41 |
r = service_demand_pid_file(s);
|
|
|
ff2b41 |
if (r < 0 || !cgroup_good(s))
|
|
|
ff2b41 |
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
|
|
|
ff2b41 |
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_PROTOCOL);
|
|
|
ff2b41 |
break;
|
|
|
ff2b41 |
}
|
|
|
ff2b41 |
} else
|
|
|
ff2b41 |
@@ -2826,7 +2826,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
|
|
|
ff2b41 |
if (r < 0) {
|
|
|
ff2b41 |
r = service_demand_pid_file(s);
|
|
|
ff2b41 |
if (r < 0 || !cgroup_good(s))
|
|
|
ff2b41 |
- service_enter_stop(s, SERVICE_FAILURE_RESOURCES);
|
|
|
ff2b41 |
+ service_enter_stop(s, SERVICE_FAILURE_PROTOCOL);
|
|
|
ff2b41 |
break;
|
|
|
ff2b41 |
}
|
|
|
ff2b41 |
} else
|
|
|
ff2b41 |
@@ -3428,6 +3428,7 @@ DEFINE_STRING_TABLE_LOOKUP(notify_state, NotifyState);
|
|
|
ff2b41 |
static const char* const service_result_table[_SERVICE_RESULT_MAX] = {
|
|
|
ff2b41 |
[SERVICE_SUCCESS] = "success",
|
|
|
ff2b41 |
[SERVICE_FAILURE_RESOURCES] = "resources",
|
|
|
ff2b41 |
+ [SERVICE_FAILURE_PROTOCOL] = "protocol",
|
|
|
ff2b41 |
[SERVICE_FAILURE_TIMEOUT] = "timeout",
|
|
|
ff2b41 |
[SERVICE_FAILURE_EXIT_CODE] = "exit-code",
|
|
|
ff2b41 |
[SERVICE_FAILURE_SIGNAL] = "signal",
|
|
|
ff2b41 |
diff --git a/src/core/service.h b/src/core/service.h
|
|
|
ff2b41 |
index e0547a464e..82938a1fc4 100644
|
|
|
ff2b41 |
--- a/src/core/service.h
|
|
|
ff2b41 |
+++ b/src/core/service.h
|
|
|
ff2b41 |
@@ -108,6 +108,7 @@ typedef enum NotifyState {
|
|
|
ff2b41 |
typedef enum ServiceResult {
|
|
|
ff2b41 |
SERVICE_SUCCESS,
|
|
|
ff2b41 |
SERVICE_FAILURE_RESOURCES,
|
|
|
ff2b41 |
+ SERVICE_FAILURE_PROTOCOL,
|
|
|
ff2b41 |
SERVICE_FAILURE_TIMEOUT,
|
|
|
ff2b41 |
SERVICE_FAILURE_EXIT_CODE,
|
|
|
ff2b41 |
SERVICE_FAILURE_SIGNAL,
|