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

Merge pull request #21030 from DaanDeMeyer/path-skipped

Browse Source 
core: Propagate condition failed state from service to path unit.
This commit is contained in:
Lennart Poettering
2021-11-04 15:20:00 +01:00
committed by GitHub
parent a4eba5d8cf 12ab94a1e4
commit 71bb9594e9
14 changed files with 81 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/socket.c
+19 -9
View File
@@ -2335,6 +2335,15 @@ static void socket_enter_running(Socket *s, int cfd_in) {
goto refuse;
}
if (UNIT_ISSET(s->service) && cfd < 0) {
Unit *service = UNIT_DEREF(s->service);
if (unit_has_failed_condition_or_assert(service)) {
socket_enter_dead(s, SOCKET_FAILURE_SERVICE_CONDITION_FAILED);
return;
}
}
if (cfd < 0) {
bool pending = false;
Unit *other;
@@ -3444,15 +3453,16 @@ static const char* const socket_exec_command_table[_SOCKET_EXEC_COMMAND_MAX] = {
DEFINE_STRING_TABLE_LOOKUP(socket_exec_command, SocketExecCommand);
static const char* const socket_result_table[_SOCKET_RESULT_MAX] = {
[SOCKET_SUCCESS] = "success",
[SOCKET_FAILURE_RESOURCES] = "resources",
[SOCKET_FAILURE_TIMEOUT] = "timeout",
[SOCKET_FAILURE_EXIT_CODE] = "exit-code",
[SOCKET_FAILURE_SIGNAL] = "signal",
[SOCKET_FAILURE_CORE_DUMP] = "core-dump",
[SOCKET_FAILURE_START_LIMIT_HIT] = "start-limit-hit",
[SOCKET_FAILURE_TRIGGER_LIMIT_HIT] = "trigger-limit-hit",
[SOCKET_FAILURE_SERVICE_START_LIMIT_HIT] = "service-start-limit-hit"
[SOCKET_SUCCESS] = "success",
[SOCKET_FAILURE_RESOURCES] = "resources",
[SOCKET_FAILURE_TIMEOUT] = "timeout",
[SOCKET_FAILURE_EXIT_CODE] = "exit-code",
[SOCKET_FAILURE_SIGNAL] = "signal",
[SOCKET_FAILURE_CORE_DUMP] = "core-dump",
[SOCKET_FAILURE_START_LIMIT_HIT] = "start-limit-hit",
[SOCKET_FAILURE_TRIGGER_LIMIT_HIT] = "trigger-limit-hit",
[SOCKET_FAILURE_SERVICE_START_LIMIT_HIT] = "service-start-limit-hit",
[SOCKET_FAILURE_SERVICE_CONDITION_FAILED] = "service-condition-failed",
};
DEFINE_STRING_TABLE_LOOKUP(socket_result, SocketResult);