]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
dsync: Don't log "Mailbox changes caused a desync" warning when running via doveadm...
authorTimo Sirainen <tss@iki.fi>
Fri, 20 Sep 2013 01:27:29 +0000 (04:27 +0300)
committerTimo Sirainen <tss@iki.fi>
Fri, 20 Sep 2013 01:27:29 +0000 (04:27 +0300)
src/doveadm/dsync/doveadm-dsync.c

index 819b54f84a780f4ee7f305ebccc2f0293537d8ba..aa95de56a1fb45315d359f8dad1635277fdde170 100644 (file)
@@ -576,8 +576,12 @@ cmd_dsync_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user)
        }
 
        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) {