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

Revert "Bug 15253: Add Koha::Logger based logging for SIP2" 

This reverts commit 03c03ed8cd.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Nick Clemens 2019-04-18 17:57:51 +00:00
parent 97faa17d71
commit 296e0ce224
12 changed files with 13 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/SIP/ILS.pm
View File

@ -6,7 +6,7 @@ package C4::SIP::ILS;
use warnings;
use strict;
use C4::SIP::Sip qw(syslog);
use Sys::Syslog qw(syslog);
use Data::Dumper;
use C4::SIP::ILS::Item;

2
C4/SIP/ILS/Item.pm
View File

@ -9,7 +9,7 @@ package C4::SIP::ILS::Item;
use strict;
use warnings;
use C4::SIP::Sip qw(syslog);
use Sys::Syslog qw(syslog);
use Carp;
use Template;

2
C4/SIP/ILS/Patron.pm
View File

@ -12,7 +12,7 @@ use warnings;
use Exporter;
use Carp;
use C4::SIP::Sip qw(syslog);
use Sys::Syslog qw(syslog);
use Data::Dumper;
use C4::SIP::Sip qw(add_field);

2
C4/SIP/ILS/Transaction/Checkout.pm
View File

@ -8,7 +8,7 @@ use warnings;
use strict;
use POSIX qw(strftime);
use C4::SIP::Sip qw(syslog);
use Sys::Syslog qw(syslog);
use Data::Dumper;
use CGI qw ( -utf8 );

2
C4/SIP/ILS/Transaction/RenewAll.pm
View File

@ -6,7 +6,7 @@ package C4::SIP::ILS::Transaction::RenewAll;
use strict;
use warnings;
use C4::SIP::Sip qw(syslog);
use Sys::Syslog qw(syslog);
use C4::SIP::ILS::Item;

82
C4/SIP/SIPServer.pm
View File

@ -5,23 +5,18 @@ use strict;
use warnings;
use FindBin qw($Bin);
use lib "$Bin";
use Sys::Syslog qw(syslog);
use Net::Server::PreFork;
use IO::Socket::INET;
use Socket qw(:DEFAULT :crlf);
use Scalar::Util qw(blessed);
require UNIVERSAL::require;
use C4::Context;
use C4::SIP::Sip qw(syslog);
use C4::SIP::Sip::Constants qw(:all);
use C4::SIP::Sip::Configuration;
use C4::SIP::Sip::Checksum qw(checksum verify_cksum);
use C4::SIP::Sip::MsgType qw( handle login_core );
use Koha::Logger;
use C4::SIP::Trapper;
tie *STDERR, "C4::SIP::Trapper";
use base qw(Net::Server::PreFork);
use constant LOG_SIP => "local6"; # Local alias for the logging facility
@ -85,9 +80,6 @@ __PACKAGE__ ->run(@parms);
# Child
#
my $activeSIPServer;
my $activeLogger;
# process_request is the callback used by Net::Server to handle
# an incoming connection request.
@ -99,13 +91,6 @@ sub process_request {
$self->{config} = $config;
$self->{account} = undef; # Clear out the account from the last request, it may be different
$self->{logger} = _set_logger( Koha::Logger->get( { interface => 'sip' } ) );
# Flush previous MDCs to prevent accidentally leaking incorrect MDC-entries
Log::Log4perl::MDC->put( "accountid", undef );
Log::Log4perl::MDC->put( "peeraddr", undef );
my $sockname = getsockname(STDIN);
# Check if socket connection is IPv6 before resolving address
@ -171,19 +156,6 @@ sub raw_transport {
}
alarm 0;
$self->{logger} = _set_logger(
Koha::Logger->get(
{
interface => 'sip',
category => $self->{account}->{id}, # Add id to namespace
}
)
);
# Set MDCs after properly authenticating
Log::Log4perl::MDC->put( "accountid", $self->{account}->{id} );
Log::Log4perl::MDC->put( "peeraddr", $self->{server}->{peeraddr} );
syslog("LOG_DEBUG", "raw_transport: uname/inst: '%s/%s'",
$self->{account}->{id},
$self->{account}->{institution});
@ -421,58 +393,6 @@ sub get_timeout {
}
}
=head2 get_SIPServer
my $sipServer = C4::SIP::SIPServer::get_SIPServer()
@RETURNS C4::SIP::SIPServer, the current server's child-process used to handle this SIP-transaction
=cut
sub get_SIPServer {
unless($activeSIPServer) {
my @cc = caller(1);
die "$cc[3]() asks for \$activeSIPServer, but he is not defined yet";
}
return $activeSIPServer;
}
sub _set_SIPServer {
my ($sipServer) = @_;
unless (blessed($sipServer) && $sipServer->isa('C4::SIP::SIPServer')) {
my @cc = caller(0);
die "$cc[3]():> \$sipServer '$sipServer' is not a C4::SIP::SIPServer-object";
}
$activeSIPServer = $sipServer;
return $activeSIPServer;
}
=head2 get_logger
my $logger = C4::SIP::SIPServer::get_logger()
@RETURNS Koha::Logger, the logger used to log this SIP-transaction
=cut
sub get_logger {
unless($activeLogger) {
my @cc = caller(1);
die "$cc[3]() asks for \$activeLogger, but he is not defined yet";
}
return $activeLogger;
}
sub _set_logger {
my ($logger) = @_;
unless (blessed($logger) && $logger->isa('Koha::Logger')) {
my @cc = caller(0);
die "$cc[3]():> \$logger '$logger' is not a Koha::Logger-object";
}
$activeLogger = $logger;
return $activeLogger;
}
1;
__END__

20
C4/SIP/Sip.pm
View File

@ -8,6 +8,7 @@ use strict;
use warnings;
use Exporter;
use Encode;
use Sys::Syslog qw(syslog);
use POSIX qw(strftime);
use Socket qw(:crlf);
use IO::Handle;
@ -20,13 +21,13 @@ use base qw(Exporter);
our @EXPORT_OK = qw(y_or_n timestamp add_field maybe_add add_count
denied sipbool boolspace write_msg
$error_detection $protocol_version $field_delimiter
$last_response syslog);
$last_response);
our %EXPORT_TAGS = (
all => [qw(y_or_n timestamp add_field maybe_add
add_count denied sipbool boolspace write_msg
$error_detection $protocol_version
$field_delimiter $last_response syslog)]);
$field_delimiter $last_response)]);
our $error_detection = 0;
our $protocol_version = 1;
@ -192,19 +193,4 @@ sub write_msg {
$last_response = $msg;
}
sub syslog {
my ( $level, $mask, @args ) = @_;
my $method =
$level eq 'LOG_ERR' ? 'error'
: $level eq 'LOG_DEBUG' ? 'debug'
: $level eq 'LOG_INFO' ? 'info'
: $level eq 'LOG_WARNING' ? 'warn'
: 'error';
my $message = @args ? sprintf($mask, @args) : $mask;
C4::SIP::SIPServer::get_logger()->$method($message);
}
1;

4
C4/SIP/Sip/Configuration.pm
View File

@ -10,8 +10,6 @@ use strict;
use warnings;
use XML::Simple qw(:strict);
use C4::SIP::Sip qw(syslog);
my $parser = new XML::Simple(
KeyAttr => {
login => '+id',
@ -65,7 +63,7 @@ sub find_service {
my $portstr;
foreach my $addr ( '', '*:', "$sockaddr:", "[$sockaddr]:" ) {
$portstr = sprintf( "%s%s/%s", $addr, $port, lc $proto );
syslog( "LOG_DEBUG",
Sys::Syslog::syslog( "LOG_DEBUG",
"Configuration::find_service: Trying $portstr" );
last if ( exists( ( $self->{listeners} )->{$portstr} ) );
}

1
C4/SIP/Sip/MsgType.pm
View File

@ -9,6 +9,7 @@ package C4::SIP::Sip::MsgType;
use strict;
use warnings;
use Exporter;
use Sys::Syslog qw(syslog);
use C4::SIP::Sip qw(:all);
use C4::SIP::Sip::Constants qw(:all);

22
C4/SIP/Trapper.pm
View File

@ -1,22 +0,0 @@
package C4::SIP::Trapper;
use Modern::Perl;
use Koha::Logger;
sub TIEHANDLE {
my $class = shift;
bless [], $class;
}
sub PRINT {
my $self = shift;
$Log::Log4perl::caller_depth++;
my $logger =
Koha::Logger->get( { interface => 'sip', category => 'STDERR' } );
warn @_;
$logger->error(@_);
$Log::Log4perl::caller_depth--;
}
1;

7
Koha/Logger.pm
View File

@ -159,14 +159,11 @@ sub _check_conf { # check logfiles in log4perl config (at initialization)
if ( $l =~ /(OPAC|INTRANET)\.filename\s*=\s*(.*)\s*$/i ) {
# we only check the two default logfiles, skipping additional ones
if ( !-w $2 ) {
warn "Log file $2 is not writable!";
return;
};
return if !-w $2;
push @logs, $1 . ':' . $2;
}
}
return unless @logs; # we should find one
return if !@logs; # we should find one
return \@logs;
}

16
etc/log4perl.conf
View File

@ -2,9 +2,6 @@ log4perl.logger.intranet = WARN, INTRANET
log4perl.appender.INTRANET=Log::Log4perl::Appender::File
log4perl.appender.INTRANET.filename=__LOG_DIR__/intranet-error.log
log4perl.appender.INTRANET.mode=append
log4perl.appender.INTRANET.create_at_logtime=true
log4perl.appender.INTRANET.syswrite=true
log4perl.appender.INTRANET.recreate=true
log4perl.appender.INTRANET.layout=PatternLayout
log4perl.appender.INTRANET.layout.ConversionPattern=[%d] [%p] %m %l %n
@ -12,18 +9,5 @@ log4perl.logger.opac = WARN, OPAC
log4perl.appender.OPAC=Log::Log4perl::Appender::File
log4perl.appender.OPAC.filename=__LOG_DIR__/opac-error.log
log4perl.appender.OPAC.mode=append
log4perl.appender.OPAC.create_at_logtime=true
log4perl.appender.OPAC.syswrite=true
log4perl.appender.OPAC.recreate=true
log4perl.appender.OPAC.layout=PatternLayout
log4perl.appender.OPAC.layout.ConversionPattern=[%d] [%p] %m %l %n
log4perl.logger.sip = DEBUG, SIP
log4perl.appender.SIP=Log::Log4perl::Appender::File
log4perl.appender.SIP.filename=__LOG_DIR__/sip2.log
log4perl.appender.SIP.mode=append
log4perl.appender.SIP.create_at_logtime=true
log4perl.appender.SIP.syswrite=true
log4perl.appender.SIP.recreate=true
log4perl.appender.SIP.layout=PatternLayout
log4perl.appender.SIP.layout.ConversionPattern=[%d] [%p] %X{accountid}@%X{peeraddr}: %m %l %n