Bug 15253: Remove specific logging output

* We should not call Log::Log4perl directly
* Not sure it is correct as I get from (comment 77):
 % koha-sip --restart

 [2020/04/23 11:23:27] [ERROR] [undef]@[undef]: Argument "0.33_01" isn't
 numeric in numeric lt (<) at /usr/share/perl5/Net/Server/Log/Sys/Syslog.pm
 line 42.
  C4::SIP::Trapper::PRINT /kohadevbox/koha/C4/SIP/Trapper.pm (24)

 Why "ERROR" when it's a warning?
 The [undef]@[undef] seems wrong here.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/C4/SIP/SIPServer.pm b/C4/SIP/SIPServer.pm
index b14aaa9..7af3554 100755 (executable)
--- a/C4/SIP/SIPServer.pm
+++ b/C4/SIP/SIPServer.pm
@@ -105,10 +105,6 @@ sub process_request {
     $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
@@ -183,10 +179,6 @@ sub raw_transport {
         )
     );
 
-    # Set MDCs after properly authenticating
-    Log::Log4perl::MDC->put( "accountid", $self->{account}->{id} );
-    Log::Log4perl::MDC->put( "peeraddr",  $self->{server}->{peeraddr} );
-
     siplog("LOG_DEBUG", "raw_transport: uname/inst: '%s/%s'",
         $self->{account}->{id},
         $self->{account}->{institution});

diff --git a/debian/koha-common.postinst b/debian/koha-common.postinst
index 173f700..46bc087 100644 (file)
--- a/debian/koha-common.postinst
+++ b/debian/koha-common.postinst
@@ -182,7 +182,7 @@ 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] %X{accountid}@%X{peeraddr}: %m %l %n
+log4perl.appender.SIP.layout.ConversionPattern=[%d] [%p] %m %l %n
 log4perl.appender.SIP.utf8=1
 
 EOF

diff --git a/debian/templates/log4perl-site.conf.in b/debian/templates/log4perl-site.conf.in
index e437973..df61c9a 100644 (file)
--- a/debian/templates/log4perl-site.conf.in
+++ b/debian/templates/log4perl-site.conf.in
@@ -35,5 +35,5 @@ log4perl.appender.SIP=Log::Log4perl::Appender::File
 log4perl.appender.SIP.filename=__LOG_DIR__/sip.log
 log4perl.appender.SIP.mode=append
 log4perl.appender.SIP.layout=PatternLayout
-log4perl.appender.SIP.layout.ConversionPattern=[%d] [%p] %X{accountid}@%X{peeraddr}: %m %l %n
+log4perl.appender.SIP.layout.ConversionPattern=[%d] [%p] %m %l %n
 log4perl.appender.SIP.utf8=1

diff --git a/etc/log4perl.conf b/etc/log4perl.conf
index e437973..df61c9a 100644 (file)
--- a/etc/log4perl.conf
+++ b/etc/log4perl.conf
@@ -35,5 +35,5 @@ log4perl.appender.SIP=Log::Log4perl::Appender::File
 log4perl.appender.SIP.filename=__LOG_DIR__/sip.log
 log4perl.appender.SIP.mode=append
 log4perl.appender.SIP.layout=PatternLayout
-log4perl.appender.SIP.layout.ConversionPattern=[%d] [%p] %X{accountid}@%X{peeraddr}: %m %l %n
+log4perl.appender.SIP.layout.ConversionPattern=[%d] [%p] %m %l %n
 log4perl.appender.SIP.utf8=1