dovecot-2.1: master: Don't log errors at shutdown about services...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/ba5d4c918842
changeset: 13705:ba5d4c918842
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Nov 16 19:04:31 2011 +0200
description:
master: Don't log errors at shutdown about services' "command startup failed".

diffstat:

 src/master/service-monitor.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r 346c022df7af -r ba5d4c918842 src/master/service-monitor.c
--- 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);
 		}