rpms/dovecot/devel dovecot-1.1.alpha3-wakeup.patch, NONE, 1.1.2.1 dovecot.spec, 1.90, 1.90.2.1

[Tomas Janousek (tjanouse)]

Author: tjanouse

Update of /cvs/pkgs/rpms/dovecot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31030

Modified Files:
      Tag: private-1_1-branch
	dovecot.spec 
Added Files:
      Tag: private-1_1-branch
	dovecot-1.1.alpha3-wakeup.patch 
Log Message:
* Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 1.1-16.2.alpha3
- wakeup work (252140)


dovecot-1.1.alpha3-wakeup.patch:

--- NEW FILE dovecot-1.1.alpha3-wakeup.patch ---
--- dovecot-1.1.alpha3/src/master/auth-process.c.wakeup	2007-08-13 14:02:27.000000000 +0200
+++ dovecot-1.1.alpha3/src/master/auth-process.c	2007-08-16 15:33:41.000000000 +0200
@@ -372,6 +372,9 @@
 	if (close(p->fd) < 0)
 		i_error("close(auth) failed: %m");
 	i_free(p);
+
+	if (io_loop_is_running(ioloop))
+		auth_processes_start_missing(NULL);
 }
 
 static void
@@ -755,7 +758,7 @@
 		"slowing down for now");
 	auth_stalled = TRUE;
 
-	timeout_remove(&to);
+	/*timeout_remove(&to);*/
 	to = timeout_add(60*1000, auth_processes_start_missing, NULL);
 }
 
@@ -787,20 +790,22 @@
 
 		auth_stalled = FALSE;
 		timeout_remove(&to);
-		to = timeout_add(1000, auth_processes_start_missing, NULL);
+		/*to = timeout_add(1000, auth_processes_start_missing, NULL);*/
 	}
 }
 
 void auth_processes_init(void)
 {
 	process_groups = NULL;
-	to = timeout_add(1000, auth_processes_start_missing, NULL);
+	/*to = timeout_add(1000, auth_processes_start_missing, NULL);*/
+	to = NULL;
 
 	auth_processes_start_missing(NULL);
 }
 
 void auth_processes_deinit(void)
 {
-	timeout_remove(&to);
+	if (to != NULL)
+		timeout_remove(&to);
 	auth_processes_destroy_all();
 }
--- dovecot-1.1.alpha3/src/master/login-process.c.wakeup	2007-08-02 17:38:14.000000000 +0200
+++ dovecot-1.1.alpha3/src/master/login-process.c	2007-08-16 15:53:40.000000000 +0200
@@ -503,6 +503,9 @@
 
 	o_stream_unref(&p->output);
 	i_free(p);
+
+	if (io_loop_is_running(ioloop))
+		login_processes_start_missing(NULL);
 }
 
 static void login_process_init_env(struct login_group *group, pid_t pid)
@@ -806,7 +809,7 @@
 		"slowing down for now");
 	logins_stalled = TRUE;
 
-	timeout_remove(&to);
+	/*timeout_remove(&to);*/
 	to = timeout_add(60*1000, login_processes_start_missing, NULL);
 }
 
@@ -815,12 +818,6 @@
 {
 	struct login_group *group;
 
-	if (!have_initialized_auth_processes) {
-		/* don't create login processes before at least one auth
-		   process has finished initializing */
-		return;
-	}
-
 	if (login_groups == NULL)
 		login_process_groups_create();
 
@@ -832,6 +829,19 @@
 	}
 }
 
+static void
+login_processes_start(void *context __attr_unused__)
+{
+	if (!have_initialized_auth_processes) {
+		/* don't create login processes before at least one auth
+		   process has finished initializing */
+		return;
+	}
+
+	timeout_remove(&to);
+	login_processes_start_missing(NULL);
+}
+
 static int login_process_send_env(struct login_process *p)
 {
 	extern char **environ;
@@ -912,7 +922,7 @@
 					   login_process_destroyed);
 
 	if (!IS_INETD()) {
-		to = timeout_add(1000, login_processes_start_missing, NULL);
+		to = timeout_add(1000, login_processes_start, NULL);
 		io_listen = NULL;
 	} else {
 		to = NULL;


Index: dovecot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.90
retrieving revision 1.90.2.1
diff -u -r1.90 -r1.90.2.1
--- dovecot.spec	22 Aug 2007 12:45:08 -0000	1.90
+++ dovecot.spec	25 Sep 2007 09:23:38 -0000	1.90.2.1
@@ -3,7 +3,7 @@
 %define upstream 1.1.alpha3
 %define sieve_upstream 1.1-%{sieve_hg}
 %define pkg_version 1.1
-%define my_release 16.1
+%define my_release 16.2
 %define pkg_release %{my_release}.alpha3%{?dist}
 %define pkg_sieve_version 1.1
 %define pkg_sieve_release %{my_release}.hg.%{sieve_hg}%{?dist}
@@ -38,6 +38,7 @@
 Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch105: dovecot-1.0.rc7-mkcert-paths.patch
 Patch107: dovecot-1.1-unicodedata.patch
+Patch108: dovecot-1.1.alpha3-wakeup.patch
 #Patch200: dovecot-%{dovecot_hg}.patch
 
 # XXX this patch needs review and forward porting
@@ -171,6 +172,7 @@
 %patch103 -p1 -b .mkcert-permissions
 %patch105 -p1 -b .mkcert-paths
 %patch107 -p1 -b .unicodedata
+%patch108 -p1 -b .wakeup
 #%patch200 -p1 -b .%{dovecot_hg}
 
 %if %{build_sieve}
@@ -399,6 +401,9 @@
 %endif
 
 %changelog
+* Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 1.1-16.2.alpha3
+- wakeup work (252140)
+
 * Wed Aug 22 2007 Tomas Janousek <tjanouse at redhat.com> - 1.1-16.1.alpha3
 - updated license tags