dovecot-2.0: lib-master: MASTER_SERVICE_FLAG_NO_IDLE_DIE wasn't ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/c9e8144974f1
changeset: 11626:c9e8144974f1
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Jun 24 15:47:13 2010 +0100
description:
lib-master: MASTER_SERVICE_FLAG_NO_IDLE_DIE wasn't actually working.

diffstat:

 src/lib-master/master-service.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (16 lines):

diff -r c5e78bd1d758 -r c9e8144974f1 src/lib-master/master-service.c
--- a/src/lib-master/master-service.c	Thu Jun 24 15:13:26 2010 +0100
+++ b/src/lib-master/master-service.c	Thu Jun 24 15:47:13 2010 +0100
@@ -58,8 +58,10 @@
 			  si->si_signo, dec2str(si->si_pid),
 			  dec2str(si->si_uid),
 			  lib_signal_code_to_str(si->si_signo, si->si_code));
-	} else if ((service->flags & (MASTER_SERVICE_FLAG_STANDALONE |
-				      MASTER_SERVICE_FLAG_NO_IDLE_DIE)) == 0) {
+	} else if ((service->flags & MASTER_SERVICE_FLAG_NO_IDLE_DIE) != 0) {
+		/* never die when idling */
+		return;
+	} else if ((service->flags & MASTER_SERVICE_FLAG_STANDALONE) == 0) {
 		/* SIGINT came from master. die only if we're not handling
 		   any clients currently. */
 		if (service->master_status.available_count !=