Mercurial > dovecot > core-2.2

changeset 13705:ba5d4c918842

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
master: Don't log errors at shutdown about services' "command startup failed".
author Timo Sirainen <tss@iki.fi>
date Wed, 16 Nov 2011 19:04:31 +0200
parents 346c022df7af
children 3368f9b3c8df
files src/master/service-monitor.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/service-monitor.c	Wed Nov 16 18:15:46 2011 +0200
+++ b/src/master/service-monitor.c	Wed Nov 16 19:04:31 2011 +0200
@@ -289,7 +289,8 @@
 {
 	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 @@
 			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);
 		}