gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 34070: Add error handling for ERROR frames 

This change causes es_indexer_daemon.pl to die on ERROR frames instead
of spinning in an infinite loop. It also adds a content-type STOMP frame header
to help consumers know what data type is in the MESSAGE frame body.

To test ERROR handling for es_indexer_daemon.pl:
1. Switch to using Elasticsearch
2. Change your RabbitMQ connection details in koha-conf.xml or the hard-coded ones in Koha/BackgroundJob.pm
to include an invalid password. For example, if you don't have a message_broker already defined, use the following:
<message_broker>
 <password>bad</password>
</message_broker>
3. sudo koha-es-indexer --restart kohadev
4. View the errors in the logs:
tail -f /var/log/koha/kohadev/es-indexer-output.log
tail -f /var/log/koha/kohadev/es-indexer-error.log

To test MESSAGE handling for es_indexer_daemon.pl:
1. Switch to using Elasticsearch (and ensure RabbitMQ connection details are correct)
2. Change the title of a bib record to something new and unique
3. Try to search for the bib using the new title
4. Note you can find it
5. Look in the logs just to make sure there are no messages there

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
David Cook 2025-02-14 02:39:28 +00:00 committed by Katrin Fischer
parent d669cab7a2
commit 2c1314ead6
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Koha/BackgroundJob.pm
View File

@ -151,8 +151,12 @@ sub enqueue {
my $namespace = C4::Context->config('memcached_namespace');
my $encoded_args = Encode::encode_utf8($json_args); # FIXME We should better leave this to Net::Stomp?
my $destination = sprintf( "/queue/%s-%s", $namespace, $job_queue );
$conn->send_with_receipt( { destination => $destination, body => $encoded_args, persistent => 'true' } )
or Koha::Exceptions::BackgroundJob->throw('Job has not been enqueued');
$conn->send_with_receipt(
{
destination => $destination, body => $encoded_args, persistent => 'true',
'content-type' => 'application/json'
}
) or Koha::Exceptions::BackgroundJob->throw('Job has not been enqueued');
} catch {
$self->status('failed')->store;
if ( ref($_) eq 'Koha::Exceptions::BackgroundJob' ) {

23
misc/workers/es_indexer_daemon.pl
View File

@ -118,8 +118,27 @@ while (1) {
}
my $args = try {
my $body = $frame->body;
decode_json($body); # TODO Should this be from_json? Check utf8 flag.
my $command = $frame->command;
my $body = $frame->body;
my $content_type = $frame->content_type;
if ( $command && $command eq 'MESSAGE' ) {
if ( $content_type && $content_type eq 'application/json' ) {
decode_json($body); # TODO Should this be from_json? Check utf8 flag.
} else {
#TODO: This is a fallback for older enqueued messages which are missing the content-type header
#TODO: Please replace this decode with a die in the future once content-type is well established
decode_json($body); # TODO Should this be from_json? Check utf8 flag.
}
} elsif ( $command && $command eq 'ERROR' ) {
#Known errors:
#You must log in using CONNECT first
#"NACK" must include a valid "message-id" header
Koha::Logger->get( { interface => 'worker' } )
->warn( sprintf "Shutting down after receiving ERROR frame:\n%s\n", $frame->as_string );
exit 1;
}
} catch {
Koha::Logger->get( { interface => 'worker' } )->warn( sprintf "Frame not processed - %s", $_ );
return;