dsync: Remove unnecessary DSYNC_MAILBOX_TREES_SYNC_FLAG_DEBUG

The debug status comes from the parent event.

diff --git a/src/doveadm/dsync/dsync-brain-mailbox-tree.c b/src/doveadm/dsync/dsync-brain-mailbox-tree.c
index f9a8d0a4521f213612debc2ba3c4b0cce326137a..b26afc263e9722438b34a2debb554ab133a233f3 100644 (file)
--- a/src/doveadm/dsync/dsync-brain-mailbox-tree.c
+++ b/src/doveadm/dsync/dsync-brain-mailbox-tree.c
@@ -385,8 +385,7 @@ static void dsync_brain_mailbox_trees_sync(struct dsync_brain *brain)
        struct dsync_mailbox_tree_sync_ctx *ctx;
        const struct dsync_mailbox_tree_sync_change *change;
        enum dsync_mailbox_trees_sync_type sync_type;
-       enum dsync_mailbox_trees_sync_flags sync_flags =
-               (brain->debug ? DSYNC_MAILBOX_TREES_SYNC_FLAG_DEBUG : 0);
+       enum dsync_mailbox_trees_sync_flags sync_flags = 0;
        int ret;
 
        if (brain->no_backup_overwrite)

diff --git a/src/doveadm/dsync/dsync-mailbox-tree-sync.c b/src/doveadm/dsync/dsync-mailbox-tree-sync.c
index dee5a0697795b3af62dc3c095a2d9391a44b3b02..3b21764663abf3f32ae723ca9991ce9d528ea5c8 100644 (file)
--- a/src/doveadm/dsync/dsync-mailbox-tree-sync.c
+++ b/src/doveadm/dsync/dsync-mailbox-tree-sync.c
@@ -1400,9 +1400,7 @@ dsync_mailbox_trees_sync_init(struct dsync_mailbox_tree *local_tree,
        ctx->sync_type = sync_type;
        ctx->sync_flags = sync_flags;
 
-       bool force_debug = (ctx->sync_flags & DSYNC_MAILBOX_TREES_SYNC_FLAG_DEBUG) != 0;
        ctx->event = event_create(parent_event);
-       event_set_forced_debug(ctx->event, force_debug);
        i_array_init(&ctx->changes, 128);
 
 again:

diff --git a/src/doveadm/dsync/dsync-mailbox-tree.h b/src/doveadm/dsync/dsync-mailbox-tree.h
index dc921052ce5d2ad9f9dc9e023228e33f4f6fb26e..310c4864ce1dd1ef00df7f51606bbced91417c05 100644 (file)
--- a/src/doveadm/dsync/dsync-mailbox-tree.h
+++ b/src/doveadm/dsync/dsync-mailbox-tree.h
@@ -17,8 +17,6 @@ enum dsync_mailbox_trees_sync_type {
 };
 
 enum dsync_mailbox_trees_sync_flags {
-       /* Enable debugging */
-       DSYNC_MAILBOX_TREES_SYNC_FLAG_DEBUG             = 0x01,
        /* Disable mailbox renaming logic. This is just a kludge that should
           be removed once the renaming logic has no more bugs.. */
        DSYNC_MAILBOX_TREES_SYNC_FLAG_NO_RENAMES        = 0x04

diff --git a/src/doveadm/dsync/test-dsync-mailbox-tree-sync.c b/src/doveadm/dsync/test-dsync-mailbox-tree-sync.c
index 6b3770812a1ddcfe1e4980489fbb57147d502f9e..62b48e288aabaf1eaa94844c9c2e8a088a0748c4 100644 (file)
--- a/src/doveadm/dsync/test-dsync-mailbox-tree-sync.c
+++ b/src/doveadm/dsync/test-dsync-mailbox-tree-sync.c
@@ -194,8 +194,7 @@ static void test_trees_nofree(struct dsync_mailbox_tree *tree1,
        dsync_mailbox_tree_build_guid_hash(tree2, &dup_node1, &dup_node2);
        ctx = dsync_mailbox_trees_sync_init(tree1, tree2,
                                            DSYNC_MAILBOX_TREES_SYNC_TYPE_TWOWAY,
-                                           DSYNC_MAILBOX_TREES_SYNC_FLAG_DEBUG,
-                                           event);
+                                           0, event);
        while (dsync_mailbox_trees_sync_next(ctx) != NULL) {
        }
        dsync_mailbox_trees_sync_deinit(&ctx);