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

Bug 14167: (QA followup) use warn instead of just STDERR 

This patch makes Koha::Logger use 'warn' instead of just printing
to STDERR. It introduces tests for this warnings too.

Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
This commit is contained in:
Tomas Cohen Arazi 2015-07-21 10:50:17 -03:00
parent e32d731238
commit b69beb2499
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Koha/Logger.pm
View File

@ -87,15 +87,15 @@ sub AUTOLOAD {
#do not use log4perl; no print to stderr
}
elsif ( !$self->_recheck_logfile ) {
print STDERR "Log file not writable for log4perl\n";
print STDERR "$method: $line\n" if $line;
warn "Log file not writable for log4perl";
warn "$method: $line" if $line;
}
elsif ( $self->{logger}->can($method) ) { #use log4perl
$self->{logger}->$method($line);
return 1;
}
else { # we should not really get here
print STDERR "ERROR: Unsupported method $method\n";
warn "ERROR: Unsupported method $method";
}
return;
}

35
t/Logger.t
View File

@ -1,3 +1,20 @@
#!/usr/bin/perl
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
use C4::Context;
@ -6,13 +23,16 @@ use Koha::Logger;
use File::Temp qw/tempfile/;
use Test::MockModule;
use Test::More tests => 1;
use Test::Warn;
subtest 'Test01 -- Simple tests for Koha::Logger' => sub {
plan tests => 6;
plan tests => 8;
test01();
};
sub test01 {
my $ret;
my $mContext = new Test::MockModule('C4::Context');
$mContext->mock( 'config', sub { return; } );
@ -35,9 +55,16 @@ HERE
$logger= Koha::Logger->get({ interface => 'intranet' });
is( exists $logger->{logger}, 1, 'Log4perl config found');
is( $logger->warn('Message 2'), 1, 'Message 2 returned a value' );
is( $logger->catastrophe, undef, 'catastrophe undefined');
warning_is { $ret = $logger->catastrophe }
"ERROR: Unsupported method catastrophe",
"Undefined method raises warning";
is( $ret, undef, "'catastrophe' method undefined");
system("chmod 400 $log");
is( $logger->warn('Message 3'), undef, 'Message 3 returned undef' );
warnings_are { $ret = $logger->warn('Message 3') }
[ "Log file not writable for log4perl",
"warn: Message 3" ],
"Warnings raised if log file is not writeable";
is( $ret, undef, 'Message 3 returned undef' );
}
sub mytempfile {
@ -46,3 +73,5 @@ sub mytempfile {
close $fh;
return $fn;
}
1;