From c71a45f2bd9f1b380343d30013030f6b54659c3d Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Tue, 18 Feb 2025 14:30:56 +0000 Subject: [PATCH] Bug 39154: Add sip.log test in about See bug 36954. The file sip.log should not be found anymore in log4perl.conf. Test plan: Edit log4perl.conf. Replace sip-output.log by sip.log. Check About, tab sysinfo. You should see a warn. Edit again. Switch back to sip-output.log. Verify that there is no warn anymore on about. Signed-off-by: Marcel de Rooy Signed-off-by: David Nind --- about.pl | 4 +++- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/about.pl b/about.pl index 952bfdf10b..2ad46f931d 100755 --- a/about.pl +++ b/about.pl @@ -826,7 +826,9 @@ sub log4perl_check { for my $line (@lines) { next unless $line =~ m|log4perl\.appender\.\w+\.filename=(.*)|; my $file = $1; - if ( !-w $file ) { + if ( $file =~ /sip\.log$/ ) { + push @log4perl_errors, 'sip_log_still_found'; + } elsif ( !-w $file ) { push @log4perl_errors, 'logfile_not_writable'; #NOTE: An unwritable logfile blocks plack.psgi. So you wont reach this script. (BZ 39155) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 71b5a91153..904b37f372 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -449,6 +449,8 @@ One of the logfiles listed in the config file is not writable. [% CASE 'cannot_init_module' %] The Koha::Logger module cannot be initiated correctly (check the log file). + [% CASE 'sip_log_still_found' %] + Config file log4perl.conf still refers to sip.log (instead of sip-output.log). [% CASE %] Unknown error '[% e | html %]'. [% END %] -- 2.39.5