From 9c385e747340bec04d89a894e871fb1f95393d14 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 30 Jan 2025 10:06:14 +0000 Subject: [PATCH] Bug 36954: (follow-up) Return to the two logfiles pattern Note that --errlog should refer to all output from the wrapper daemon process only like respawning processes etc. And that --output should refer to all output from the daemonized client process (so in our case the SIP server). Moving a few sip.log occurrences to sip-output in that regard. Test plan: Restart koha-sip. Login to sip server. Restart koha-sip. Verify that you see Net::Server messages and traces from the login in the -output log. The restarts are not found however in -error. See my comment on the BZ report. Signed-off-by: Marcel de Rooy Signed-off-by: David Nind --- debian/koha-common.postinst | 2 +- debian/koha-core.postinst | 2 +- debian/scripts/koha-sip | 8 +++++--- debian/templates/log4perl-site.conf.in | 2 +- etc/log4perl.conf | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/koha-common.postinst b/debian/koha-common.postinst index f109c21f44..083dcebfc4 100644 --- a/debian/koha-common.postinst +++ b/debian/koha-common.postinst @@ -177,7 +177,7 @@ for site in $(koha-list); do 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.filename=/var/log/koha/$site/sip-output.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 diff --git a/debian/koha-core.postinst b/debian/koha-core.postinst index 26616d8ebb..c70827ffb9 100644 --- a/debian/koha-core.postinst +++ b/debian/koha-core.postinst @@ -177,7 +177,7 @@ for site in $(koha-list); do 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.filename=/var/log/koha/$site/sip-output.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 diff --git a/debian/scripts/koha-sip b/debian/scripts/koha-sip index aca6cac6ba..37b0125134 100755 --- a/debian/scripts/koha-sip +++ b/debian/scripts/koha-sip @@ -77,7 +77,8 @@ start_sip() fi DAEMONOPTS="--name=${name}-koha-sip \ - --output=/var/log/koha/${name}/sip.log \ + --errlog=/var/log/koha/${name}/sip-error.log \ + --output=/var/log/koha/${name}/sip-output.log \ --verbose=1 \ --respawn \ --delay=30 \ @@ -115,7 +116,8 @@ stop_sip() if is_sip_running $name; then DAEMONOPTS="--name=${name}-koha-sip \ - --output=/var/log/koha/${name}/sip.log \ + --errlog=/var/log/koha/${name}/sip-error.log \ + --output=/var/log/koha/${name}/sip-output.log \ --verbose=1 \ --respawn \ --delay=30 \ @@ -227,7 +229,7 @@ _check_and_fix_perms() { local name=$1 - local files="/var/log/koha/${name}/sip.log" + local files="/var/log/koha/${name}/sip-error.log /var/log/koha/${name}/sip-output.log" for file in ${files} do diff --git a/debian/templates/log4perl-site.conf.in b/debian/templates/log4perl-site.conf.in index 3ea1d7e680..f6587541e9 100644 --- a/debian/templates/log4perl-site.conf.in +++ b/debian/templates/log4perl-site.conf.in @@ -32,7 +32,7 @@ log4perl.appender.API.utf8=1 log4perl.logger.sip = DEBUG, SIP log4perl.appender.SIP=Log::Log4perl::Appender::File -log4perl.appender.SIP.filename=__LOG_DIR__/sip.log +log4perl.appender.SIP.filename=__LOG_DIR__/sip-output.log log4perl.appender.SIP.mode=append log4perl.appender.SIP.layout=PatternLayout log4perl.appender.SIP.layout.ConversionPattern=[%d] [%P] [%p] %X{accountid}@%X{peeraddr}: %m{chomp} %l%n diff --git a/etc/log4perl.conf b/etc/log4perl.conf index c0965ad07d..9c16c52348 100644 --- a/etc/log4perl.conf +++ b/etc/log4perl.conf @@ -39,7 +39,7 @@ log4perl.appender.API.utf8=1 log4perl.logger.sip = DEBUG, SIP log4perl.appender.SIP=Log::Log4perl::Appender::File -log4perl.appender.SIP.filename=__LOG_DIR__/sip.log +log4perl.appender.SIP.filename=__LOG_DIR__/sip-output.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 -- 2.39.5