Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 35819: Improve logging

Browse source 
Log (warn) if the job will be processed later, but add a debug however.

Have a specific log for bad status

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 30e69ebc56)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Jonathan Druart 2024-01-26 14:25:56 +01:00 committed by Fridolin Somers
parent 87e3d35e84
commit f8af6d5028
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
misc/workers/background_jobs_worker.pl
View file

@ -74,6 +74,9 @@ my $max_processes = $ENV{MAX_PROCESSES};
$max_processes ||= C4::Context->config('background_jobs_worker')->{max_processes} if C4::Context->config('background_jobs_worker'); $max_processes ||= C4::Context->config('background_jobs_worker')->{max_processes} if C4::Context->config('background_jobs_worker');
$max_processes ||= 1; $max_processes ||= 1;
my $not_found_retries = {};
my $max_retries = $ENV{MAX_RETRIES} || 10;
GetOptions( GetOptions(
'm|max-processes=i' => \$max_processes, 'm|max-processes=i' => \$max_processes,
'h|help' => \$help, 'h|help' => \$help,
@ -131,10 +134,29 @@ while (1) {
next; next;
} }
my $job = Koha::BackgroundJobs->search( { id => $args->{job_id}, status => 'new' } )->next; my $job = Koha::BackgroundJobs->find( $args->{job_id} );
unless ($job) {
if ( $job && $job->status ne 'new' ) {
Koha::Logger->get( { interface => 'worker' } ) Koha::Logger->get( { interface => 'worker' } )
->warn( sprintf "Job %s not found, or has wrong status", $args->{job_id} ); ->warn( sprintf "Job %s has wrong status %s", $args->{job_id}, $job->status );
# nack without requeue, we do not want to process this frame again
$conn->nack( { frame => $frame, requeue => 'false' } );
next;
}
unless ($job) {
if ( ++$not_found_retries->{$args->{job_id}} >= $max_retries ) {
Koha::Logger->get( { interface => 'worker' } )
->warn( sprintf "Job %s not found, no more retry", $args->{job_id} );
# nack without requeue, we do not want to process this frame again
$conn->nack( { frame => $frame, requeue => 'false' } );
next;
}
Koha::Logger->get( { interface => 'worker' } )
->debug( sprintf "Job %s not found, will retry later", $args->{job_id} );
# nack to force requeue # nack to force requeue
$conn->nack( { frame => $frame, requeue => 'true' } ); $conn->nack( { frame => $frame, requeue => 'true' } );