From 03f66464310d487521260070dc7ffe135a020530 Mon Sep 17 00:00:00 2001 From: David Cook Date: Thu, 2 Feb 2023 03:21:29 +0000 Subject: [PATCH] Bug 32791: Update koha-common and koha-core packaging to include koha-log4perl --- debian/koha-common.install | 1 + debian/koha-common.postinst | 103 +----------------------------------- debian/koha-core.install | 1 + debian/koha-core.postinst | 103 +----------------------------------- 4 files changed, 4 insertions(+), 204 deletions(-) diff --git a/debian/koha-common.install b/debian/koha-common.install index 2f5c793d11..dc5c078bac 100644 --- a/debian/koha-common.install +++ b/debian/koha-common.install @@ -19,6 +19,7 @@ debian/scripts/koha-enable usr/sbin debian/scripts/koha-foreach usr/sbin debian/scripts/koha-indexer usr/sbin debian/scripts/koha-list usr/sbin +debian/scripts/koha-log4perl usr/sbin debian/scripts/koha-mysql usr/sbin debian/scripts/koha-passwd usr/sbin debian/scripts/koha-plack usr/sbin diff --git a/debian/koha-common.postinst b/debian/koha-common.postinst index 2540ea654f..c165aea80d 100644 --- a/debian/koha-common.postinst +++ b/debian/koha-common.postinst @@ -131,110 +131,9 @@ EOF fi fi -log4perl_component() -{ - local config=$1 - local component=$2 - - if grep -q "log4perl.logger.$component" $config; then - return 0 - else - return 1 - fi -} - # Take care of the instance's log4perl.conf file for site in $(koha-list); do - log4perl_config="/etc/koha/sites/$site/log4perl.conf" - if ! log4perl_component $log4perl_config "z3950"; then - cat <> $log4perl_config -log4perl.logger.z3950 = WARN, Z3950 -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.utf8=1 - -EOF - fi - - if ! log4perl_component $log4perl_config "api"; then - cat <> $log4perl_config -log4perl.logger.api = WARN, API -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.utf8=1 - -EOF - fi -done - -for site in $(koha-list); do - log4perl_config="/etc/koha/sites/$site/log4perl.conf" - if ! log4perl_component $log4perl_config "sip"; then - cat <> $log4perl_config -log4perl.logger.sip = DEBUG, SIP -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] %X{accountid}@%X{peeraddr}: %m %l%n -log4perl.appender.SIP.utf8=1 - -EOF - fi -done - -for site in $(koha-list); do - log4perl_config="/etc/koha/sites/$site/log4perl.conf" - if ! log4perl_component $log4perl_config "plack-opac"; then - cat <> $log4perl_config -log4perl.logger.plack-opac = WARN, PLACKOPAC -log4perl.appender.PLACKOPAC=Log::Log4perl::Appender::File -log4perl.appender.PLACKOPAC.filename=/var/log/koha/$site/plack-opac-error.log -log4perl.appender.PLACKOPAC.mode=append -log4perl.appender.PLACKOPAC.layout=PatternLayout -log4perl.appender.PLACKOPAC.layout.ConversionPattern=[%d] [%p] %m%n -log4perl.appender.PLACKOPAC.utf8=1 - -EOF - fi -done - -for site in $(koha-list); do - log4perl_config="/etc/koha/sites/$site/log4perl.conf" - if ! log4perl_component $log4perl_config "plack-api"; then - cat <> $log4perl_config -log4perl.logger.plack-api = WARN, PLACKAPI -log4perl.appender.PLACKAPI=Log::Log4perl::Appender::File -log4perl.appender.PLACKAPI.filename=/var/log/koha/$site/plack-api-error.log -log4perl.appender.PLACKAPI.mode=append -log4perl.appender.PLACKAPI.layout=PatternLayout -log4perl.appender.PLACKAPI.layout.ConversionPattern=[%d] [%p] %m%n -log4perl.appender.PLACKAPI.utf8=1 - -EOF - fi -done - -for site in $(koha-list); do - log4perl_config="/etc/koha/sites/$site/log4perl.conf" - if ! log4perl_component $log4perl_config "plack-intranet"; then - cat <> $log4perl_config -log4perl.logger.plack-intranet = WARN, PLACKINTRANET -log4perl.appender.PLACKINTRANET=Log::Log4perl::Appender::File -log4perl.appender.PLACKINTRANET.filename=/var/log/koha/$site/plack-intranet-error.log -log4perl.appender.PLACKINTRANET.mode=append -log4perl.appender.PLACKINTRANET.layout=PatternLayout -log4perl.appender.PLACKINTRANET.layout.ConversionPattern=[%d] [%p] %m%n -log4perl.appender.PLACKINTRANET.utf8=1 - -EOF - fi + koha-log4perl $site done for site in $(koha-list); do diff --git a/debian/koha-core.install b/debian/koha-core.install index 2f5c793d11..dc5c078bac 100644 --- a/debian/koha-core.install +++ b/debian/koha-core.install @@ -19,6 +19,7 @@ debian/scripts/koha-enable usr/sbin debian/scripts/koha-foreach usr/sbin debian/scripts/koha-indexer usr/sbin debian/scripts/koha-list usr/sbin +debian/scripts/koha-log4perl usr/sbin debian/scripts/koha-mysql usr/sbin debian/scripts/koha-passwd usr/sbin debian/scripts/koha-plack usr/sbin diff --git a/debian/koha-core.postinst b/debian/koha-core.postinst index 8162c00870..09b3d001f4 100644 --- a/debian/koha-core.postinst +++ b/debian/koha-core.postinst @@ -131,110 +131,9 @@ EOF fi fi -log4perl_component() -{ - local config=$1 - local component=$2 - - if grep -q "log4perl.logger.$component" $config; then - return 0 - else - return 1 - fi -} - # Take care of the instance's log4perl.conf file for site in $(koha-list); do - log4perl_config="/etc/koha/sites/$site/log4perl.conf" - if ! log4perl_component $log4perl_config "z3950"; then - cat <> $log4perl_config -log4perl.logger.z3950 = WARN, Z3950 -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.utf8=1 - -EOF - fi - - if ! log4perl_component $log4perl_config "api"; then - cat <> $log4perl_config -log4perl.logger.api = WARN, API -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.utf8=1 - -EOF - fi -done - -for site in $(koha-list); do - log4perl_config="/etc/koha/sites/$site/log4perl.conf" - if ! log4perl_component $log4perl_config "sip"; then - cat <> $log4perl_config -log4perl.logger.sip = DEBUG, SIP -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] %X{accountid}@%X{peeraddr}: %m %l%n -log4perl.appender.SIP.utf8=1 - -EOF - fi -done - -for site in $(koha-list); do - log4perl_config="/etc/koha/sites/$site/log4perl.conf" - if ! log4perl_component $log4perl_config "plack-opac"; then - cat <> $log4perl_config -log4perl.logger.plack-opac = WARN, PLACKOPAC -log4perl.appender.PLACKOPAC=Log::Log4perl::Appender::File -log4perl.appender.PLACKOPAC.filename=/var/log/koha/$site/plack-opac-error.log -log4perl.appender.PLACKOPAC.mode=append -log4perl.appender.PLACKOPAC.layout=PatternLayout -log4perl.appender.PLACKOPAC.layout.ConversionPattern=[%d] [%p] %m%n -log4perl.appender.PLACKOPAC.utf8=1 - -EOF - fi -done - -for site in $(koha-list); do - log4perl_config="/etc/koha/sites/$site/log4perl.conf" - if ! log4perl_component $log4perl_config "plack-api"; then - cat <> $log4perl_config -log4perl.logger.plack-api = WARN, PLACKAPI -log4perl.appender.PLACKAPI=Log::Log4perl::Appender::File -log4perl.appender.PLACKAPI.filename=/var/log/koha/$site/plack-api-error.log -log4perl.appender.PLACKAPI.mode=append -log4perl.appender.PLACKAPI.layout=PatternLayout -log4perl.appender.PLACKAPI.layout.ConversionPattern=[%d] [%p] %m%n -log4perl.appender.PLACKAPI.utf8=1 - -EOF - fi -done - -for site in $(koha-list); do - log4perl_config="/etc/koha/sites/$site/log4perl.conf" - if ! log4perl_component $log4perl_config "plack-intranet"; then - cat <> $log4perl_config -log4perl.logger.plack-intranet = WARN, PLACKINTRANET -log4perl.appender.PLACKINTRANET=Log::Log4perl::Appender::File -log4perl.appender.PLACKINTRANET.filename=/var/log/koha/$site/plack-intranet-error.log -log4perl.appender.PLACKINTRANET.mode=append -log4perl.appender.PLACKINTRANET.layout=PatternLayout -log4perl.appender.PLACKINTRANET.layout.ConversionPattern=[%d] [%p] %m%n -log4perl.appender.PLACKINTRANET.utf8=1 - -EOF - fi + koha-log4perl $site done for site in $(koha-list); do -- 2.30.2