diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs index 95090ddc6..6de519c10 100644 --- a/deltachat-ffi/src/lib.rs +++ b/deltachat-ffi/src/lib.rs @@ -1505,8 +1505,7 @@ 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)); - info!(&ctx, "verbose (issue 2335): ffi called dc_delete_msgs()"); + block_on(message::delete_msgs(&ctx, &msg_ids)) } #[no_mangle] diff --git a/scripts/set_core_version.py b/scripts/set_core_version.py old mode 100755 new mode 100644 diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs index 85484b4cb..e8933f58c 100644 --- a/src/dc_receive_imf.rs +++ b/src/dc_receive_imf.rs @@ -258,12 +258,14 @@ 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, 0), + job::Job::new( + Action::DeleteMsgOnImap, + db_entry.1.to_u32(), + Params::new(), + 0, + ), ) .await; } diff --git a/src/job.rs b/src/job.rs index c309b7cb5..7b8285275 100644 --- a/src/job.rs +++ b/src/job.rs @@ -635,7 +635,6 @@ 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. @@ -646,7 +645,6 @@ 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(())) @@ -1032,7 +1030,6 @@ pub(crate) enum Connection<'a> { pub(crate) async fn load_imap_deletion_job(context: &Context) -> sql::Result> { 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(), @@ -1142,7 +1139,7 @@ async fn perform_job_action( ) -> Status { info!( context, - "{} begin immediate try {} of job {:?} - verbose (issue 2335)", &connection, tries, job + "{} begin immediate try {} of job {}", &connection, tries, job ); let try_res = match job.action { @@ -1401,14 +1398,9 @@ 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 75e1e72ff..0d1c36371 100644 --- a/src/message.rs +++ b/src/message.rs @@ -1438,12 +1438,9 @@ 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, 0), + job::Job::new(Action::DeleteMsgOnImap, msg_id.to_u32(), Params::new(), 0), ) .await; }