Attachment 167148 Details for Bug 36948 – Bug 36948: (follow-up) Remove log_file param, adjust caller_depth

[patch] Bug 36948: (follow-up) Remove log_file param, adjust caller_depth

Bug-36948-follow-up-Remove-logfile-param-adjust-ca.patch (text/plain), 2.07 KB, created by Marcel de Rooy on 2024-05-24 08:52:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2024-05-24 08:52:10 UTC

Size: 2.07 KB

patch

obsolete

>From 812c44ab926e2cb96824fe3ca6768048a0fb129c Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 24 May 2024 07:55:27 +0000
>Subject: [PATCH] Bug 36948: (follow-up) Remove log_file param, adjust
> caller_depth
>Content-Type: text/plain; charset=utf-8
>
>We keep OPEN when people still use log_file or setsid.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> C4/SIP/Trapper.pm              | 12 +++++++++---
> debian/templates/SIPconfig.xml |  3 ---
> etc/SIPconfig.xml              |  3 ---
> 3 files changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/C4/SIP/Trapper.pm b/C4/SIP/Trapper.pm
>index ef99b5de17..08e93191ae 100644
>--- a/C4/SIP/Trapper.pm
>+++ b/C4/SIP/Trapper.pm
>@@ -27,20 +27,26 @@ sub TIEHANDLE {
> 
> sub PRINT {
>     my $self = shift;
>-    $Log::Log4perl::caller_depth++;
>+    $Log::Log4perl::caller_depth += 3;
>     my $logger =
>       Koha::Logger->get( { interface => 'sip', category => 'STDERR' } );
>     warn @_;
>     $logger->warn(@_);
>-    $Log::Log4perl::caller_depth--;
>+    $Log::Log4perl::caller_depth -= 3;
> }
> 
>+=head2 OPEN
>+
>+    We need OPEN in case Net::Server tries to redirect STDERR. This will
>+    be tried when param log_file or setsid is passed.
>+
>+=cut
>+
> sub OPEN {
>     return 1;
> }
> 
> =head2 BINMODE
>-
>     Suppress errors from Log::Log4perl::Appender::Screen
> 
> =cut
>diff --git a/debian/templates/SIPconfig.xml b/debian/templates/SIPconfig.xml
>index dc1ca38a4d..53b0638802 100644
>--- a/debian/templates/SIPconfig.xml
>+++ b/debian/templates/SIPconfig.xml
>@@ -10,9 +10,6 @@
>   <server-params
>     min_servers='1'
>     min_spare_servers='0'
>-    log_file='/var/log/koha/__KOHASITE__/sip.log'
>-    syslog_ident='koha_sip'
>-    syslog_facility='local6'
>   />
> 
>   <listeners>
>diff --git a/etc/SIPconfig.xml b/etc/SIPconfig.xml
>index 356175af12..33f1859c9f 100644
>--- a/etc/SIPconfig.xml
>+++ b/etc/SIPconfig.xml
>@@ -15,9 +15,6 @@
>     min_servers='1'
>     min_spare_servers='0'
>     max_servers='1'
>-    log_file='Sys::Syslog'
>-    syslog_ident='koha_sip'
>-    syslog_facility='local6'
>     setsid="1"
>     user='koha'
>     group='koha'
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 36948: 167112 | 167134 | 167147 | 167148 | 167149 | 167150 | 167151 | 167152 | 167153