Merge pull request #4923 from cyrusimap/fix_imap_move_logging

imapd.c: properly log and count [X]MOVE commands
cyrusimap · May 21, 2024 · a8637b1 · a8637b1
2 parents 9244022 + 8f90d0b
commit a8637b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/imap/imapd.c b/imap/imapd.c
@@ -2079,11 +2079,11 @@ static void cmdloop(void)
                 cmd_copy(tag.s, arg1.s, arg2.s, usinguid, /*ismove*/1);
 
                 if (cmdname[0] == 'x')
-                    client_behavior.did_move = 1;
-                else
                     client_behavior.did_xmove = 1;
+                else
+                    client_behavior.did_move = 1;
 
-                prometheus_increment(CYRUS_IMAP_COPY_TOTAL);
+                prometheus_increment(CYRUS_IMAP_MOVE_TOTAL);
             } else goto badcmd;
             break;
 

diff --git a/imap/promdata.p b/imap/promdata.p
@@ -50,6 +50,7 @@ metric counter cyrus_imap_logout_total                  The total number of IMAP
 metric counter cyrus_imap_list_total                    The total number of IMAP LISTs
 metric counter cyrus_imap_lsub_total                    The total number of IMAP LSUBs
 metric counter cyrus_imap_listrights_total              The total number of IMAP LISTRIGHTSs
+metric counter cyrus_imap_move_total                    The total number of IMAP MOVEs
 metric counter cyrus_imap_myrights_total                The total number of IMAP MYRIGHTSs
 metric counter cyrus_imap_mupdatepush_total             The total number of IMAP MUPDATEPUSHs
 metric counter cyrus_imap_replace_total                 The total number of IMAP REPLACEs