From 5394327bf652696449a62a7e9932f6b56b570a6e Mon Sep 17 00:00:00 2001
From: Hocuri <hocuri@gmx.de>
Date: Sat, 10 Apr 2021 16:08:41 +0200
Subject: [PATCH] More logging for "core spams imap events"

TODO: revert
---
 deltachat-ffi/src/lib.rs |  3 ++-
 src/dc_receive_imf.rs    | 10 ++++------
 src/job.rs               | 10 +++++++++-
 src/message.rs           |  5 ++++-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs
index eb9b4cf38..47ae586d0 100644
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -1505,7 +1505,8 @@ pub unsafe extern "C" fn dc_delete_msgs(
     let ctx = &*context;
     let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
 
-    block_on(message::delete_msgs(&ctx, &msg_ids))
+    block_on(message::delete_msgs(&ctx, &msg_ids));
+    info!(&ctx, "verbose (issue 2335): ffi called dc_delete_msgs()");
 }
 
 #[no_mangle]
diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index bb06c3d75..427393c7a 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -262,14 +262,12 @@ pub(crate) async fn dc_receive_imf_inner(
     if !created_db_entries.is_empty() {
         if needs_delete_job || delete_server_after == Some(0) {
             for db_entry in &created_db_entries {
+                info!(context, "verbose (issue 2335): adding job after receive");
+                let mut params = Params::new();
+                params.set(Param::Arg, "comment: verbose (issue 2335) dc_receive_imf()");
                 job::add(
                     context,
-                    job::Job::new(
-                        Action::DeleteMsgOnImap,
-                        db_entry.1.to_u32(),
-                        Params::new(),
-                        0,
-                    ),
+                    job::Job::new(Action::DeleteMsgOnImap, db_entry.1.to_u32(), params, 0),
                 )
                 .await;
             }
diff --git a/src/job.rs b/src/job.rs
index 6aeb6d9c8..a8b01cf05 100644
--- a/src/job.rs
+++ b/src/job.rs
@@ -635,6 +635,7 @@ impl Job {
                 // Hidden messages are similar to trashed, but are
                 // related to some chat. We also delete their
                 // database records.
+                info!(context, "verbose (issue 2335): will delete from db");
                 job_try!(msg.id.delete_from_db(context).await)
             } else {
                 // Remove server UID from the database record.
@@ -645,6 +646,7 @@ impl Job {
                 // we remove UID to reduce the number of messages
                 // pointing to the corresponding UID. Once the counter
                 // reaches zero, we will remove the message.
+                info!(context, "verbose (issue 2335): will unlink");
                 job_try!(msg.id.unlink(context).await);
             }
             Status::Finished(Ok(()))
@@ -1030,6 +1032,7 @@ pub(crate) enum Connection<'a> {
 
 async fn load_imap_deletion_job(context: &Context) -> sql::Result<Option<Job>> {
     let res = if let Some(msg_id) = load_imap_deletion_msgid(context).await? {
+        info!(context, "verbose (issue 2335): loading imap deletion job");
         Some(Job::new(
             Action::DeleteMsgOnImap,
             msg_id.to_u32(),
@@ -1139,7 +1142,7 @@ async fn perform_job_action(
 ) -> Status {
     info!(
         context,
-        "{} begin immediate try {} of job {}", &connection, tries, job
+        "{} begin immediate try {} of job {:?} - verbose (issue 2335)", &connection, tries, job
     );
 
     let try_res = match job.action {
@@ -1398,9 +1401,14 @@ LIMIT 1;
                         .unwrap_or_default()
                         .or(Some(job))
                 } else {
+                    info!(context, "verbose (issue 2335): executing job normally");
                     Some(job)
                 }
             } else if let Some(job) = load_imap_deletion_job(context).await.unwrap_or_default() {
+                info!(
+                    context,
+                    "verbose (issue 2335): loaded imap deletion job (no others queued)"
+                );
                 Some(job)
             } else {
                 load_housekeeping_job(context).await
diff --git a/src/message.rs b/src/message.rs
index d4fcc07b4..cb7dc59c4 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -1439,9 +1439,12 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) {
         if let Err(err) = msg_id.trash(context).await {
             error!(context, "Unable to trash message {}: {}", msg_id, err);
         }
+        info!(context, "verbose delete_msgs()");
+        let mut params = Params::new();
+        params.set(Param::Arg, "comment: verbose (issue 2335) delete_msgs()");
         job::add(
             context,
-            job::Job::new(Action::DeleteMsgOnImap, msg_id.to_u32(), Params::new(), 0),
+            job::Job::new(Action::DeleteMsgOnImap, msg_id.to_u32(), params, 0),
         )
         .await;
     }