master: Don't log errors at shutdown about services' "command startup failed".

diff --git a/src/master/service-monitor.c b/src/master/service-monitor.c
index 222753f8e2815c4550dd487f4a9fb18c8d836fe1..814862f7b74cb206106a3f244d5b9a93c19f4474 100644 (file)
--- 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);
                }