Attachment 110254 Details for Bug 16357 – Bug 16357: Only use Log4perl middleware if appenders defined

[patch] Bug 16357: Only use Log4perl middleware if appenders defined

Bug-16357-Only-use-Log4perl-middleware-if-appender.patch (text/plain), 2.05 KB, created by Martin Renvoize (ashimema) on 2020-09-17 08:26:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-09-17 08:26:16 UTC

Size: 2.05 KB

patch

obsolete

>From 493a72643a3f909bd77d0462b327dd1c9839db21 Mon Sep 17 00:00:00 2001
>From: David Cook <dcook@prosentient.com.au>
>Date: Wed, 26 Aug 2020 00:58:36 +0000
>Subject: [PATCH] Bug 16357: Only use Log4perl middleware if appenders defined
>
>This patch checks that the loggers used by the middleware
>actually have appenders defined.
>
>Without this patch, if the loggers don't have appenders
>defined in the log4perl file, the logs will just be lost.
>
>Signed-off-by: Arthur Suzuki <arthur.suzuki@biblibre.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> debian/templates/plack.psgi | 19 +++++++++++++------
> 1 file changed, 13 insertions(+), 6 deletions(-)
>
>diff --git a/debian/templates/plack.psgi b/debian/templates/plack.psgi
>index 7bfb34fb68..99438c595a 100644
>--- a/debian/templates/plack.psgi
>+++ b/debian/templates/plack.psgi
>@@ -38,6 +38,7 @@ use Koha::Database;
> use Koha::DateUtils;
> use Koha::Logger;
> 
>+use Log::Log4perl;
> use CGI qw(-utf8 ); # we will loose -utf8 under plack, otherwise
> {
>     no warnings 'redefine';
>@@ -77,18 +78,24 @@ builder {
>     enable "+Koha::Middleware::RealIP";
> 
>     mount '/opac'          => builder {
>-        enable 'Log4perl', category => 'plack-opac';
>-        enable 'LogWarn';
>+        if ( Log::Log4perl->get_logger('plack-opac')->has_appenders ){
>+            enable 'Log4perl', category => 'plack-opac';
>+            enable 'LogWarn';
>+        }
>         $opac;
>     };
>     mount '/intranet'      => builder {
>-        enable 'Log4perl', category => 'plack-intranet';
>-        enable 'LogWarn';
>+        if ( Log::Log4perl->get_logger('plack-intranet')->has_appenders ){
>+            enable 'Log4perl', category => 'plack-intranet';
>+            enable 'LogWarn';
>+        }
>         $intranet;
>     };
>     mount '/api/v1/app.pl' => builder {
>-        enable 'Log4perl', category => 'plack-api';
>-        enable 'LogWarn';
>+        if ( Log::Log4perl->get_logger('plack-api')->has_appenders ){
>+            enable 'Log4perl', category => 'plack-api';
>+            enable 'LogWarn';
>+        }
>         $apiv1;
>     };
> };
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 16357: 71752 | 71753 | 71871 | 72290 | 72296 | 73404 | 77529 | 77530 | 77531 | 77532 | 77533 | 106141 | 106313 | 106319 | 106320 | 109053 | 109054 | 109055 | 109056 | 109060 | 109067 | 109068 | 109133 | 109215 | 110107 | 110108 | 110109 | 110249 | 110250 | 110251 | 110252 | 110253 | 110254