dovecot-2.2: dsync: Don't log "Mailbox changes caused a desync" ...
dovecot at dovecot.org
dovecot at dovecot.org
Fri Sep 20 04:27:44 EEST 2013
details: http://hg.dovecot.org/dovecot-2.2/rev/3da7f0dad08f
changeset: 16784:3da7f0dad08f
user: Timo Sirainen <tss at iki.fi>
date: Fri Sep 20 04:27:29 2013 +0300
description:
dsync: Don't log "Mailbox changes caused a desync" warning when running via doveadm-server.
diffstat:
src/doveadm/dsync/doveadm-dsync.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (18 lines):
diff -r 17aaab5511f2 -r 3da7f0dad08f src/doveadm/dsync/doveadm-dsync.c
--- a/src/doveadm/dsync/doveadm-dsync.c Fri Sep 20 04:20:22 2013 +0300
+++ b/src/doveadm/dsync/doveadm-dsync.c Fri Sep 20 04:27:29 2013 +0300
@@ -576,8 +576,12 @@
}
if (dsync_brain_has_unexpected_changes(brain) || changes_during_sync) {
- i_warning("Mailbox changes caused a desync. "
- "You may want to run dsync again.");
+ /* don't log a warning when running via doveadm server
+ (e.g. called by replicator) */
+ if (ctx->ctx.conn == NULL) {
+ i_warning("Mailbox changes caused a desync. "
+ "You may want to run dsync again.");
+ }
ctx->ctx.exit_code = 2;
}
if (dsync_brain_deinit(&brain) < 0) {
More information about the dovecot-cvs
mailing list