core: kill processes started due to the ExecReload= on timeout
authorEvgeny Vereshchagin <evvers@ya.ru>
Fri, 11 Sep 2015 08:42:35 +0000 (11:42 +0300)
committerEvgeny Vereshchagin <evvers@ya.ru>
Fri, 11 Sep 2015 08:43:27 +0000 (11:43 +0300)
src/core/service.c

index 248a9e8..fc28ba4 100644 (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;