From 2806f15ceb68023baf65a9daad9dfdf54c622708 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 16 Nov 2011 19:04:31 +0200 Subject: [PATCH] master: Don't log errors at shutdown about services' "command startup failed". --- src/master/service-monitor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/master/service-monitor.c b/src/master/service-monitor.c index 222753f8e2..814862f7b7 100644 --- a/src/master/service-monitor.c +++ b/src/master/service-monitor.c @@ -289,7 +289,8 @@ static void service_monitor_start_extra_avail(struct service *service) { unsigned int i, count; - if (service->process_avail >= service->set->process_min_avail) + if (service->process_avail >= service->set->process_min_avail || + service->list->destroying) return; count = service->set->process_min_avail - service->process_avail; @@ -567,8 +568,7 @@ void services_monitor_reap_children(void) service_monitor_throttle(service); service_stopped = service->status_fd[0] == -1; if (!service_stopped) { - if (!service->list->destroying) - service_monitor_start_extra_avail(service); + service_monitor_start_extra_avail(service); if (service->to_throttle == NULL) service_monitor_listen_start(service); } -- 2.47.3