Mercurial > dovecot > core-2.2
changeset 16784:3da7f0dad08f
dsync: Don't log "Mailbox changes caused a desync" warning when running via doveadm-server.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Fri, 20 Sep 2013 04:27:29 +0300 |
parents | 17aaab5511f2 |
children | b135d723acf3 |
files | src/doveadm/dsync/doveadm-dsync.c |
diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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) {