From b907585402eb6eb1e167781696d788f0277d0942 Mon Sep 17 00:00:00 2001 From: Eric Phetteplace Date: Wed, 13 Oct 2021 16:51:54 -0700 Subject: [PATCH 1/1] Bug 29238 - Cataloging cron jobs are not logged Testing plan: 1. set CronjobLog to "Log" 2. Run the three cron jobs `perl misc/link_bibs_to_authorities.pl; perl misc/cronjobs/merge_authorities.pl -b; perl misc/migration_tools/remove_unused_authorities.pl --confirm` 3. Visit the log viewer /cgi-bin/koha/tools/viewlog.pl, select the "Cron jobs" module, & note it's empty 4. apply the patch 5. Repeat steps 2 & 3 but note the cron logs aren't empty --- misc/cronjobs/merge_authorities.pl | 2 ++ misc/link_bibs_to_authorities.pl | 3 +++ misc/migration_tools/remove_unused_authorities.pl | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/misc/cronjobs/merge_authorities.pl b/misc/cronjobs/merge_authorities.pl index 51cd4ef2b2..498386a592 100755 --- a/misc/cronjobs/merge_authorities.pl +++ b/misc/cronjobs/merge_authorities.pl @@ -7,6 +7,7 @@ use Time::HiRes qw( gettimeofday ); use Koha::Script -cron; use C4::AuthoritiesMarc qw( GetAuthority merge ); +use C4::Log qw( cronlogaction ); use Koha::Authority::MergeRequests; use constant RESET_HOURS => 24; @@ -21,6 +22,7 @@ GetOptions( $|=1; # flushes output if ( $params->{batch} ) { + cronlogaction(); handle_batch($params); } else { pod2usage(1); diff --git a/misc/link_bibs_to_authorities.pl b/misc/link_bibs_to_authorities.pl index 21e4cc31bb..397ae40bff 100755 --- a/misc/link_bibs_to_authorities.pl +++ b/misc/link_bibs_to_authorities.pl @@ -19,6 +19,7 @@ use C4::Biblio qw( LinkBibHeadingsToAuthorities ModBiblio ); +use C4::Log qw( cronlogaction ); use Getopt::Long qw( GetOptions ); use Pod::Usage qw( pod2usage ); use Time::HiRes qw( time ); @@ -60,6 +61,8 @@ if ( not $result or $want_help ) { usage(); } +cronlogaction(); + my $linker_module = "C4::Linker::" . ( C4::Context->preference("LinkerModule") || 'Default' ); unless ( can_load( modules => { $linker_module => undef } ) ) { diff --git a/misc/migration_tools/remove_unused_authorities.pl b/misc/migration_tools/remove_unused_authorities.pl index da57f88f42..eaf7fef993 100755 --- a/misc/migration_tools/remove_unused_authorities.pl +++ b/misc/migration_tools/remove_unused_authorities.pl @@ -24,7 +24,8 @@ use Modern::Perl; use Koha::Script; use C4::Context; -use C4::AuthoritiesMarc; +use C4::AuthoritiesMarc qw( DelAuthority ); +use C4::Log qw( cronlogaction ); use Getopt::Long qw( GetOptions ); use Koha::SearchEngine::Search; @@ -42,6 +43,9 @@ if ( $want_help || !($test || $confirm) ) { print_usage(); exit 0; } + +cronlogaction(); + if ($test) { print "*** Testing only, authorities will not be deleted. ***\n"; } -- 2.33.1