diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-11 14:44:45 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-11 14:44:45 +0200 |
| commit | f20d2634e1e9d83f5f3e3297d14533904bfd90d2 (patch) | |
| tree | 7de9792e2bf976706c0e23818ce04140a8204781 | |
| parent | 3227b2bced36940554e3cefb6b995623227de822 (diff) | |
| parent | 478b619281667f4a5b5fa2f7f8c4feebb1852949 (diff) | |
Merge pull request #1245 from evverx/kill-control-on-timeout
core: kill processes started due to the ExecReload= on timeout
| -rw-r--r-- | src/core/service.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/service.c b/src/core/service.c index 248a9e8c62..fc28ba4d07 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -2737,6 +2737,8 @@ static int service_dispatch_timer(sd_event_source *source, usec_t usec, void *us case SERVICE_RELOAD: log_unit_warning(UNIT(s), "Reload operation timed out. Stopping."); + service_unwatch_control_pid(s); + service_kill_control_processes(s); s->reload_result = SERVICE_FAILURE_TIMEOUT; service_enter_running(s, SERVICE_SUCCESS); break; |