mirror of
https://github.com/chatmail/core.git
synced 2026-04-28 10:56:29 +03:00
Revert "More logging for "core spams imap events""
This reverts commit 5394327bf6.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
10
src/job.rs
10
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<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(),
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user