Attachment 122678 Details for Bug 28620 – Bug 28620: Remove trailing space when logging with log4perl

[patch] Bug 28620: Remove trailing space when logging with log4perl

Bug-28620-Remove-trailing-space-when-logging-with-.patch (text/plain), 7.84 KB, created by Nick Clemens (kidclamp) on 2021-07-08 14:03:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2021-07-08 14:03:18 UTC

Size: 7.84 KB

patch

obsolete

>From 3851eef2fb51b897b118c6a2e66c1965dbcc4b55 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Wed, 23 Jun 2021 11:59:21 +0000
>Subject: [PATCH] Bug 28620: Remove trailing space when logging with log4perl
>
>Trivial change.
>Do sed -i -r -e'/log4perl/ s/\s%n$/%n/' on the log4perl configs.
>
>Test plan:
>Update your own config.
>Trigger some logging and check that logfile.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> debian/koha-common.postinst            |  6 +++---
> debian/koha-core.postinst              |  6 +++---
> debian/templates/log4perl-site.conf.in | 10 +++++-----
> etc/log4perl.conf                      | 10 +++++-----
> 4 files changed, 16 insertions(+), 16 deletions(-)
>
>diff --git a/debian/koha-common.postinst b/debian/koha-common.postinst
>index 9156a952f3..06fcabb0bd 100644
>--- a/debian/koha-common.postinst
>+++ b/debian/koha-common.postinst
>@@ -153,7 +153,7 @@ log4perl.appender.Z3950=Log::Log4perl::Appender::File
> log4perl.appender.Z3950.filename=/var/log/koha/$site/z3950-error.log
> log4perl.appender.Z3950.mode=append
> log4perl.appender.Z3950.layout=PatternLayout
>-log4perl.appender.Z3950.layout.ConversionPattern=[%d] [%p] %m %l %n
>+log4perl.appender.Z3950.layout.ConversionPattern=[%d] [%p] %m %l%n
> log4perl.appender.Z3950.utf8=1
> 
> EOF
>@@ -166,7 +166,7 @@ log4perl.appender.API=Log::Log4perl::Appender::File
> log4perl.appender.API.filename=/var/log/koha/$site/api-error.log
> log4perl.appender.API.mode=append
> log4perl.appender.API.layout=PatternLayout
>-log4perl.appender.API.layout.ConversionPattern=[%d] [%p] %m %l %n
>+log4perl.appender.API.layout.ConversionPattern=[%d] [%p] %m %l%n
> log4perl.appender.API.utf8=1
> 
> EOF
>@@ -182,7 +182,7 @@ log4perl.appender.SIP=Log::Log4perl::Appender::File
> log4perl.appender.SIP.filename=/var/log/koha/$site/sip.log
> log4perl.appender.SIP.mode=append
> log4perl.appender.SIP.layout=PatternLayout
>-log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %m %l %n
>+log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %m %l%n
> log4perl.appender.SIP.utf8=1
> 
> EOF
>diff --git a/debian/koha-core.postinst b/debian/koha-core.postinst
>index 348367e11d..035d3de676 100644
>--- a/debian/koha-core.postinst
>+++ b/debian/koha-core.postinst
>@@ -153,7 +153,7 @@ log4perl.appender.Z3950=Log::Log4perl::Appender::File
> log4perl.appender.Z3950.filename=/var/log/koha/$site/z3950-error.log
> log4perl.appender.Z3950.mode=append
> log4perl.appender.Z3950.layout=PatternLayout
>-log4perl.appender.Z3950.layout.ConversionPattern=[%d] [%p] %m %l %n
>+log4perl.appender.Z3950.layout.ConversionPattern=[%d] [%p] %m %l%n
> log4perl.appender.Z3950.utf8=1
> 
> EOF
>@@ -166,7 +166,7 @@ log4perl.appender.API=Log::Log4perl::Appender::File
> log4perl.appender.API.filename=/var/log/koha/$site/api-error.log
> log4perl.appender.API.mode=append
> log4perl.appender.API.layout=PatternLayout
>-log4perl.appender.API.layout.ConversionPattern=[%d] [%p] %m %l %n
>+log4perl.appender.API.layout.ConversionPattern=[%d] [%p] %m %l%n
> log4perl.appender.API.utf8=1
> 
> EOF
>@@ -182,7 +182,7 @@ log4perl.appender.SIP=Log::Log4perl::Appender::File
> log4perl.appender.SIP.filename=/var/log/koha/$site/sip.log
> log4perl.appender.SIP.mode=append
> log4perl.appender.SIP.layout=PatternLayout
>-log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %m %l %n
>+log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %m %l%n
> log4perl.appender.SIP.utf8=1
> 
> EOF
>diff --git a/debian/templates/log4perl-site.conf.in b/debian/templates/log4perl-site.conf.in
>index 4db8f89be8..b0726dce09 100644
>--- a/debian/templates/log4perl-site.conf.in
>+++ b/debian/templates/log4perl-site.conf.in
>@@ -3,7 +3,7 @@ log4perl.appender.INTRANET=Log::Log4perl::Appender::File
> log4perl.appender.INTRANET.filename=__LOG_DIR__/intranet-error.log
> log4perl.appender.INTRANET.mode=append
> log4perl.appender.INTRANET.layout=PatternLayout
>-log4perl.appender.INTRANET.layout.ConversionPattern=[%d] [%p] %m %l %n
>+log4perl.appender.INTRANET.layout.ConversionPattern=[%d] [%p] %m %l%n
> log4perl.appender.INTRANET.utf8=1
> 
> log4perl.logger.opac = WARN, OPAC
>@@ -11,7 +11,7 @@ log4perl.appender.OPAC=Log::Log4perl::Appender::File
> log4perl.appender.OPAC.filename=__LOG_DIR__/opac-error.log
> log4perl.appender.OPAC.mode=append
> log4perl.appender.OPAC.layout=PatternLayout
>-log4perl.appender.OPAC.layout.ConversionPattern=[%d] [%p] %m %l %n
>+log4perl.appender.OPAC.layout.ConversionPattern=[%d] [%p] %m %l%n
> log4perl.appender.OPAC.utf8=1
> 
> log4perl.logger.z3950 = WARN, Z3950
>@@ -19,7 +19,7 @@ log4perl.appender.Z3950=Log::Log4perl::Appender::File
> log4perl.appender.Z3950.filename=__LOG_DIR__/z3950-error.log
> log4perl.appender.Z3950.mode=append
> log4perl.appender.Z3950.layout=PatternLayout
>-log4perl.appender.Z3950.layout.ConversionPattern=[%d] [%p] %m %l %n
>+log4perl.appender.Z3950.layout.ConversionPattern=[%d] [%p] %m %l%n
> log4perl.appender.Z3950.utf8=1
> 
> log4perl.logger.api = WARN, API
>@@ -27,7 +27,7 @@ log4perl.appender.API=Log::Log4perl::Appender::File
> log4perl.appender.API.filename=__LOG_DIR__/api-error.log
> log4perl.appender.API.mode=append
> log4perl.appender.API.layout=PatternLayout
>-log4perl.appender.API.layout.ConversionPattern=[%d] [%p] %m %l %n
>+log4perl.appender.API.layout.ConversionPattern=[%d] [%p] %m %l%n
> log4perl.appender.API.utf8=1
> 
> log4perl.logger.sip = DEBUG, SIP
>@@ -35,7 +35,7 @@ log4perl.appender.SIP=Log::Log4perl::Appender::File
> log4perl.appender.SIP.filename=__LOG_DIR__/sip.log
> log4perl.appender.SIP.mode=append
> log4perl.appender.SIP.layout=PatternLayout
>-log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %m %l %n
>+log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %m %l%n
> log4perl.appender.SIP.utf8=1
> 
> 
>diff --git a/etc/log4perl.conf b/etc/log4perl.conf
>index 940c2d0397..7dbc950282 100644
>--- a/etc/log4perl.conf
>+++ b/etc/log4perl.conf
>@@ -3,7 +3,7 @@ log4perl.appender.INTRANET=Log::Log4perl::Appender::File
> log4perl.appender.INTRANET.filename=__LOG_DIR__/intranet-error.log
> log4perl.appender.INTRANET.mode=append
> log4perl.appender.INTRANET.layout=PatternLayout
>-log4perl.appender.INTRANET.layout.ConversionPattern=[%d] [%p] %m %l %n
>+log4perl.appender.INTRANET.layout.ConversionPattern=[%d] [%p] %m %l%n
> log4perl.appender.INTRANET.utf8=1
> 
> log4perl.logger.opac = WARN, OPAC
>@@ -11,7 +11,7 @@ log4perl.appender.OPAC=Log::Log4perl::Appender::File
> log4perl.appender.OPAC.filename=__LOG_DIR__/opac-error.log
> log4perl.appender.OPAC.mode=append
> log4perl.appender.OPAC.layout=PatternLayout
>-log4perl.appender.OPAC.layout.ConversionPattern=[%d] [%p] %m %l %n
>+log4perl.appender.OPAC.layout.ConversionPattern=[%d] [%p] %m %l%n
> log4perl.appender.OPAC.utf8=1
> 
> log4perl.logger.z3950 = WARN, Z3950
>@@ -19,7 +19,7 @@ log4perl.appender.Z3950=Log::Log4perl::Appender::File
> log4perl.appender.Z3950.filename=__LOG_DIR__/z3950-error.log
> log4perl.appender.Z3950.mode=append
> log4perl.appender.Z3950.layout=PatternLayout
>-log4perl.appender.Z3950.layout.ConversionPattern=[%d] [%p] %m %l %n
>+log4perl.appender.Z3950.layout.ConversionPattern=[%d] [%p] %m %l%n
> log4perl.appender.Z3950.utf8=1
> 
> log4perl.logger.api = WARN, API
>@@ -27,7 +27,7 @@ log4perl.appender.API=Log::Log4perl::Appender::File
> log4perl.appender.API.filename=__LOG_DIR__/api-error.log
> log4perl.appender.API.mode=append
> log4perl.appender.API.layout=PatternLayout
>-log4perl.appender.API.layout.ConversionPattern=[%d] [%p] %m %l %n
>+log4perl.appender.API.layout.ConversionPattern=[%d] [%p] %m %l%n
> log4perl.appender.API.utf8=1
> 
> log4perl.logger.sip = DEBUG, SIP
>@@ -35,7 +35,7 @@ log4perl.appender.SIP=Log::Log4perl::Appender::File
> log4perl.appender.SIP.filename=__LOG_DIR__/sip.log
> log4perl.appender.SIP.mode=append
> log4perl.appender.SIP.layout=PatternLayout
>-log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %m %l %n
>+log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %m %l%n
> log4perl.appender.SIP.utf8=1
> 
> log4perl.logger.plack-opac = WARN, PLACKOPAC
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 28620: 122328 | 122678 | 123174 | 123180