dovecot-2.2: replicator: Don't create replicator-doveadm socket ...

dovecot at dovecot.org dovecot at dovecot.org
Sat Apr 6 21:01:45 EEST 2013


details:   http://hg.dovecot.org/dovecot-2.2/rev/9824f8df62a3
changeset: 16216:9824f8df62a3
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Apr 06 21:01:41 2013 +0300
description:
replicator: Don't create replicator-doveadm socket by default.
Also removed the service replicator { process_min_avail=1 } requirement.
This new way allows replicator to give a flag to dsync so it will try to
notify the replicator process when user gets synced, which can be silently
ignored even if it fails (replica server doesn't need to have replicator
or even Dovecot itself running).

diffstat:

 src/replication/replicator/replicator-settings.c |  2 +-
 src/replication/replicator/replicator.c          |  7 -------
 2 files changed, 1 insertions(+), 8 deletions(-)

diffs (29 lines):

diff -r edbfb39bc10d -r 9824f8df62a3 src/replication/replicator/replicator-settings.c
--- a/src/replication/replicator/replicator-settings.c	Sat Apr 06 20:44:38 2013 +0300
+++ b/src/replication/replicator/replicator-settings.c	Sat Apr 06 21:01:41 2013 +0300
@@ -9,7 +9,7 @@
 /* <settings checks> */
 static struct file_listener_settings replicator_unix_listeners_array[] = {
 	{ "replicator", 0600, "$default_internal_user", "" },
-	{ "replicator-doveadm", 0600, "$default_internal_user", "" }
+	{ "replicator-doveadm", 0, "$default_internal_user", "" }
 };
 static struct file_listener_settings *replicator_unix_listeners[] = {
 	&replicator_unix_listeners_array[0],
diff -r edbfb39bc10d -r 9824f8df62a3 src/replication/replicator/replicator.c
--- a/src/replication/replicator/replicator.c	Sat Apr 06 20:44:38 2013 +0300
+++ b/src/replication/replicator/replicator.c	Sat Apr 06 21:01:41 2013 +0300
@@ -123,13 +123,6 @@
 		i_fatal("Error reading configuration: %s", error);
 	master_service_init_log(master_service, "replicator: ");
 
-	/* this check is here mainly so that "doveadm replicator" commands
-	   don't accidentally start an unconfigured replicator */
-	if (master_service_get_process_min_avail(master_service) == 0) {
-		i_fatal("Replicator not configured: "
-			"service replicator { process_min_avail } must be 1");
-	}
-
 	restrict_access_by_env(NULL, FALSE);
 	restrict_access_allow_coredumps(TRUE);
 	master_service_init_finish(master_service);


More information about the dovecot-cvs mailing list