Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 17:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(job): log all job events in job_perform()

Browse Source
This commit is contained in:
Alexander Krotov
2019-12-21 04:30:41 +03:00
parent 860f8a7906
commit 47be879445
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/job.rs
View File

@@ -762,7 +762,12 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
suspend_smtp_thread(context, true); suspend_smtp_thread(context, true);
} }
for _tries in 0..2 { for tries in 0..2 {
info!(
context,
"{} performs immediate try {} of job {}", thread, tries, job
);
// this can be modified by a job using dc_job_try_again_later() // this can be modified by a job using dc_job_try_again_later()
job.try_again = TryAgain::Dont; job.try_again = TryAgain::Dont;
@@ -792,6 +797,11 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
Action::SendMdnOld => {} Action::SendMdnOld => {}
Action::SendMsgToSmtpOld => {} Action::SendMsgToSmtpOld => {}
} }
info!(
context,
"{} finished immediate try {} of job {}", thread, tries, job
);
if job.try_again != TryAgain::AtOnce { if job.try_again != TryAgain::AtOnce {
break; break;
} }
@@ -813,7 +823,12 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
break; break;
} else if job.try_again == TryAgain::AtOnce || job.try_again == TryAgain::StandardDelay { } else if job.try_again == TryAgain::AtOnce || job.try_again == TryAgain::StandardDelay {
let tries = job.tries + 1; let tries = job.tries + 1;
if tries < JOB_RETRIES { if tries < JOB_RETRIES {
info!(
context,
"{} thread increases job {} tries to {}", thread, job, tries
);
job.tries = tries; job.tries = tries;
let time_offset = get_backoff_time_offset(tries); let time_offset = get_backoff_time_offset(tries);
job.desired_timestamp = time() + time_offset; job.desired_timestamp = time() + time_offset;
@@ -836,6 +851,10 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
.perform_jobs_needed = PerformJobsNeeded::AvoidDos; .perform_jobs_needed = PerformJobsNeeded::AvoidDos;
} }
} else { } else {
info!(
context,
"{} thread removes job {} as it exhausted {} retries", thread, job, JOB_RETRIES
);
if job.action == Action::SendMsgToSmtp { if job.action == Action::SendMsgToSmtp {
message::set_msg_failed( message::set_msg_failed(
context, context,
@@ -854,6 +873,10 @@ fn job_perform(context: &Context, thread: Thread, probe_network: bool) {
// to give other jobs a chance being tried at least once. // to give other jobs a chance being tried at least once.
break; break;
} else { } else {
info!(
context,
"{} removes job {} as it cannot be retried", thread, job
);
job.delete(context); job.delete(context);
} }
} }