diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-12-17 19:39:29 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-12-17 19:39:29 +0100 |
| commit | 40f41f34d4af15d0147b5b2525f0b87ff62eae9a (patch) | |
| tree | d4f998414eb62586a59534e875b5fb85f210d116 /src/core/socket.c | |
| parent | 415d7d774ab8bb46fae18dbb8aa4a69e0ad88b57 (diff) | |
| download | systemd-40f41f34d4af15d0147b5b2525f0b87ff62eae9a.tar.gz | |
Revert "core: Propagate condition failed state to triggering units."
This reverts commit 12ab94a1e4961a39c32efb60b71866ab588d3ea2.
Diffstat (limited to 'src/core/socket.c')
| -rw-r--r-- | src/core/socket.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 6b5ec9d987..8a5c7fdd0a 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -2336,15 +2336,6 @@ 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; @@ -3452,16 +3443,15 @@ 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_FAILURE_SERVICE_CONDITION_FAILED] = "service-condition-failed", + [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" }; DEFINE_STRING_TABLE_LOOKUP(socket_result, SocketResult); |