gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

We keep OPEN when people still use log_file or setsid.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Marcel de Rooy 2024-05-24 07:55:27 +00:00 committed by Martin Renvoize
parent 5dc1ec387d
commit c0d76f707b
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
C4/SIP/Trapper.pm
View File

@ -27,14 +27,21 @@ 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;
}

3
debian/templates/SIPconfig.xml vendored
View File

@ -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>

3
etc/SIPconfig.xml
View File

@ -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'