Merge pull request #1245 from evverx/kill-control-on-timeout

core: kill processes started due to the ExecReload= on timeout
This commit is contained in:
Lennart Poettering 2015-09-11 14:44:45 +02:00
commit f20d2634e1

View file

@ -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;