From 75353ccac8df0b37149b12c5b6a4fc67a5b0c0a9 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 12 Aug 2022 06:50:59 -0300 Subject: [PATCH] Bug 31342: Add execution locking to process_message_queue.pl This patch makes the script use an execution lock as provided by Koha::Script. Previous attempt got too complex and contentious, and given we have a simple way to achieve the same thing, I decided to submit an alternative approach. To test: 1. Apply this patch 2. Add the following content to misc/cronjobs/process_message_queue.pl on line 83: sleep 100; 3. Save the file 4. Have two terminals open 5. On the first one, run: $ kshell k$ misc/cronjobs/process_message_queue.pl 6. On the second one, run the same => SUCCESS: The second one dies telling it had to skip the run 7. Undo your changes: $ git checkout misc/cronjobs/process_message_queue.pl 8. Sign off :-D Sponsored-by: ByWater Solutions Signed-off-by: Liz Rea Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi (cherry picked from commit a80a96b93381a12740b8548b5d92a55bbec0b085) Signed-off-by: Lucas Gass (cherry picked from commit 9c6d9f51060f75018fc2111af40553659f52899b) Signed-off-by: Arthur Suzuki --- misc/cronjobs/process_message_queue.pl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/misc/cronjobs/process_message_queue.pl b/misc/cronjobs/process_message_queue.pl index 79f09357bf..b88d3affd8 100755 --- a/misc/cronjobs/process_message_queue.pl +++ b/misc/cronjobs/process_message_queue.pl @@ -72,6 +72,19 @@ ENDUSAGE die $usage if $help; +my $script_handler = Koha::Script->new({ script => $0 }); + +try { + $script_handler->lock_exec; +} +catch { + my $message = "Skipping execution of $0 ($_)"; + print STDERR "$message\n" + if $verbose; + cronlogaction( $message ); + exit; +}; + cronlogaction(); if ( C4::Context->config("enable_plugins") ) { -- 2.20.1