From 8df96262c145fc0ee26c019601b6a86de9396915 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 11 Jan 2023 12:36:42 +0100
Subject: [PATCH] Bug 32393: Split into 2 try catch blocks

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 misc/background_jobs_worker.pl | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/misc/background_jobs_worker.pl b/misc/background_jobs_worker.pl
index 6bbc82bc08..059d7069ba 100755
--- a/misc/background_jobs_worker.pl
+++ b/misc/background_jobs_worker.pl
@@ -94,23 +94,28 @@ while (1) {
             next;    # will reconnect automatically
         }
 
-        my $job;
-        try {
+        my $args = try {
             my $body = $frame->body;
-            my $args = decode_json($body); # TODO Should this be from_json? Check utf8 flag.
-
-            # FIXME This means we need to have create the DB entry before
-            # It could work in a first step, but then we will want to handle job that will be created from the message received
-            $job = Koha::BackgroundJobs->find($args->{job_id});
-
-            process_job( $job, $args );
+            decode_json($body); # TODO Should this be from_json? Check utf8 flag.
         } catch {
-            Koha::Logger->get->warn(sprintf "Job and/or frame not processed - %s", $_);
+            Koha::Logger->get->warn(sprintf "Frame not processed - %s", $_);
         } finally {
-            $job->status('failed')->store if $job && @_;
             $conn->ack( { frame => $frame } );
         };
 
+        next unless $args;
+
+        # FIXME This means we need to have create the DB entry before
+        # It could work in a first step, but then we will want to handle job that will be created from the message received
+        my $job = Koha::BackgroundJobs->find($args->{job_id});
+
+        unless ( $job ) {
+            Koha::Logger->get->warn(sprintf "No job found for id=%s", $args->{job_id});
+            next;
+        }
+
+        process_job( $job, $args );
+
     } else {
         my $jobs = Koha::BackgroundJobs->search({ status => 'new', queue => \@queues });
         while ( my $job = $jobs->next ) {
@@ -133,7 +138,11 @@ sub process_job {
 
     die "fork failed!" unless defined $pid;
 
-    $job->process( $args );
+    try {
+        $job->process( $args );
+    } catch {
+        $job->status('failed')->store;
+    };
 
     exit;
 }
-- 
2.39.5