From b5a3c687377abcffa98d2312389009e13f44087a Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 22 Feb 2023 18:13:35 +0000 Subject: [PATCH] Bug 33044: Return job id if there is no connection to rabbit This patch simply ensures we return the job id even if we couldn't send the job to rabbit. To test: 1 - In KTD: sudo service rabbitmq-server stop 2 - sudo koha-worker --stop kohadev; sudo koha-worker --queue long_tasks --stop kohadev 3 - In staff client enqueue a batch item modification - note the link to view the enqueued job has no id in the url and takes you to the main background jobs viewer 4 - Run t/db_dependent/Koha/BackgroundJob.t and notice that it fails. 5 - Apply patch 6 - Restart all 7 - Enqueue a new batch item modification 8 - Confirm the link works and has the correct id 9 - Run t/db_dependent/Koha/BackgroundJob.t; it should pass now. Signed-off-by: David Nind Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi (cherry picked from commit b93b6f3ddebdbcb53b435c1b9d7e64e235688d2f) Signed-off-by: Jacob O'Mara (cherry picked from commit 99454c388599a9f3eced976f913ead44b893d5d2) Signed-off-by: Lucas Gass (cherry picked from commit ff7b0a0cddf19b02ccf44ee4980d9aeafcede26b) Signed-off-by: Arthur Suzuki --- Koha/BackgroundJob.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Koha/BackgroundJob.pm b/Koha/BackgroundJob.pm index fb10f3d761..f9fb1d75dc 100644 --- a/Koha/BackgroundJob.pm +++ b/Koha/BackgroundJob.pm @@ -120,7 +120,7 @@ sub enqueue { } catch { warn "Cannot connect to broker " . $_; }; - return unless $conn; + return $self->id unless $conn; $json_args = encode_json $job_args; try { -- 2.39.5