]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
dsync: Remove unnecessary DSYNC_MAILBOX_IMPORT_FLAG_DEBUG
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Fri, 28 Oct 2022 10:00:03 +0000 (13:00 +0300)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Mon, 31 Oct 2022 16:28:37 +0000 (16:28 +0000)
The debug status comes from the parent event.

src/doveadm/dsync/dsync-brain-mailbox.c
src/doveadm/dsync/dsync-mailbox-import.c
src/doveadm/dsync/dsync-mailbox-import.h

index 6733b385d941350585cc10534c0fb72a37126148..23f6eb0df009757d2077641b0568eb8112ffb411 100644 (file)
@@ -209,8 +209,6 @@ dsync_brain_sync_mailbox_init_remote(struct dsync_brain *brain,
                import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_MASTER_BRAIN;
        if (brain->backup_recv && !brain->no_backup_overwrite)
                import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_REVERT_LOCAL_CHANGES;
-       if (brain->debug)
-               import_flags |= DSYNC_MAILBOX_IMPORT_FLAG_DEBUG;
        if (brain->local_dsync_box.have_save_guids &&
            (remote_dsync_box->have_save_guids ||
             (brain->backup_recv && remote_dsync_box->have_guids)))
index b6f1d16086862c752f9777dfd6197ecf179132c7..ed388d651f6d353e27e1af076c34a097a0248f35 100644 (file)
@@ -230,7 +230,6 @@ dsync_mailbox_import_init(struct mailbox *box,
        importer = p_new(pool, struct dsync_mailbox_importer, 1);
        importer->pool = pool;
        importer->event = event_create(parent_event);
-       event_set_forced_debug(importer->event, (flags & DSYNC_MAILBOX_IMPORT_FLAG_DEBUG) != 0);
        event_set_append_log_prefix(importer->event, t_strdup_printf(
                "Import mailbox %s: ", mailbox_get_vname(box)));
 
index e80bcf6b4928c63ee3ed8ec9297c2ca6a6834b48..65a3070f3a287576e93ed243345a82990f1c75eb 100644 (file)
@@ -7,7 +7,6 @@ enum dsync_mailbox_import_flags {
        DSYNC_MAILBOX_IMPORT_FLAG_MASTER_BRAIN          = 0x01,
        DSYNC_MAILBOX_IMPORT_FLAG_WANT_MAIL_REQUESTS    = 0x02,
        DSYNC_MAILBOX_IMPORT_FLAG_REVERT_LOCAL_CHANGES  = 0x04,
-       DSYNC_MAILBOX_IMPORT_FLAG_DEBUG                 = 0x08,
        DSYNC_MAILBOX_IMPORT_FLAG_MAILS_HAVE_GUIDS      = 0x10,
        DSYNC_MAILBOX_IMPORT_FLAG_MAILS_USE_GUID128     = 0x20,
        DSYNC_MAILBOX_IMPORT_FLAG_NO_NOTIFY             = 0x40,