View | Details | Raw Unified | Return to bug 14167
Collapse All | Expand All

(-)a/C4/Circulation.pm (-1 / +7 lines)
Lines 50-55 use Koha::DateUtils; Link Here
50
use Koha::Calendar;
50
use Koha::Calendar;
51
use Koha::Borrower::Debarments;
51
use Koha::Borrower::Debarments;
52
use Koha::Database;
52
use Koha::Database;
53
use Koha::Logger;
53
use Carp;
54
use Carp;
54
use List::MoreUtils qw( uniq );
55
use List::MoreUtils qw( uniq );
55
use Date::Calc qw(
56
use Date::Calc qw(
Lines 2787-2792 sub AddRenewal { Link Here
2787
    my $datedue         = shift;
2788
    my $datedue         = shift;
2788
    my $lastreneweddate = shift || DateTime->now(time_zone => C4::Context->tz)->ymd();
2789
    my $lastreneweddate = shift || DateTime->now(time_zone => C4::Context->tz)->ymd();
2789
2790
2791
    my $logger = Koha::Logger->get("C4::Circulation::AddRenewal");
2792
    $logger->trace( "PARAMS: " . Dumper( { borrowernumber => $borrowernumber, itemnumber => $itemnumber, branch => $branch, datedue => $datedue, lastreneweddate => $lastreneweddate } ) );
2793
2790
    my $item   = GetItem($itemnumber) or return;
2794
    my $item   = GetItem($itemnumber) or return;
2791
    my $biblio = GetBiblioFromItemNumber($itemnumber) or return;
2795
    my $biblio = GetBiblioFromItemNumber($itemnumber) or return;
2792
2796
Lines 2892-2898 sub AddRenewal { Link Here
2892
                borrowernumber => $borrowernumber,
2896
                borrowernumber => $borrowernumber,
2893
                ccode => $item->{'ccode'}}
2897
                ccode => $item->{'ccode'}}
2894
                );
2898
                );
2895
	return $datedue;
2899
2900
    $logger->trace("RETURNING $datedue");
2901
    return $datedue;
2896
}
2902
}
2897
2903
2898
sub GetRenewCount {
2904
sub GetRenewCount {
(-)a/C4/Installer/PerlDependencies.pm (+5 lines)
Lines 732-737 our $PERL_DEPS = { Link Here
732
        'required' => '0',
732
        'required' => '0',
733
        'min_ver'  => '0.31',
733
        'min_ver'  => '0.31',
734
    },
734
    },
735
    'Log::Log4perl' => {
736
        'usage'    => 'Core',
737
        'required' => '1',
738
        'min_ver'  => '1.29',
739
    },
735
};
740
};
736
741
737
1;
742
1;
(-)a/Koha/Logger.pm (+75 lines)
Line 0 Link Here
1
package Koha::Logger;
2
3
# Copyright 2015 ByWater Solutions
4
# kyle@bywatersolutions.com
5
#
6
# This file is part of Koha.
7
#
8
# Koha is free software; you can redistribute it and/or modify it under the
9
# terms of the GNU General Public License as published by the Free Software
10
# Foundation; either version 3 of the License, or (at your option) any later
11
# version.
12
#
13
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
14
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
15
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License along
18
# with Koha; if not, write to the Free Software Foundation, Inc.,
19
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20
21
=head1 NAME
22
23
Koha::Log
24
25
=head1 SYNOPSIS
26
27
  use Koha::Log;
28
29
=head1 FUNCTIONS
30
31
=cut
32
33
use Modern::Perl;
34
35
use Log::Log4perl;
36
use Carp;
37
38
use C4::Context;
39
40
BEGIN {
41
    Log::Log4perl->wrapper_register(__PACKAGE__);
42
43
    my $conf;
44
    if ( exists $ENV{"LOG4PERL_CONF"} and $ENV{'LOG4PERL_CONF'} and -s $ENV{"LOG4PERL_CONF"} ) {
45
46
        # Check for web server level configuration first
47
        $conf = $ENV{"LOG4PERL_CONF"};
48
    }
49
    else {
50
        # If no web server level config exists, look in the koha conf file for one
51
        $conf = C4::Context->config("log4perl_conf");
52
    }
53
54
    Log::Log4perl->init_once($conf);
55
}
56
57
sub get {
58
    my ( $class, $category, $interface ) = @_;
59
60
    croak("No category passed in!") unless $category;
61
62
    $interface ||= C4::Context->interface();
63
64
    return Log::Log4perl->get_logger("$interface.$category");
65
}
66
67
=head1 AUTHOR
68
69
Kyle M Hall, E<lt>kyle@bywatersolutions.comE<gt>
70
71
=cut
72
73
1;
74
75
__END__
(-)a/etc/koha-conf.xml (+1 lines)
Lines 114-119 __PAZPAR2_TOGGLE_XML_POST__ Link Here
114
 <zebra_lockdir>__ZEBRA_LOCK_DIR__</zebra_lockdir>
114
 <zebra_lockdir>__ZEBRA_LOCK_DIR__</zebra_lockdir>
115
 <use_zebra_facets>1</use_zebra_facets>
115
 <use_zebra_facets>1</use_zebra_facets>
116
 <queryparser_config>__KOHA_CONF_DIR__/searchengine/queryparser.yaml</queryparser_config>
116
 <queryparser_config>__KOHA_CONF_DIR__/searchengine/queryparser.yaml</queryparser_config>
117
 <log4perl_conf>__KOHA_CONF_DIR__/log4perl.conf</log4perl_conf>
117
118
118
 <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm -->
119
 <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm -->
119
 <ttf>
120
 <ttf>
(-)a/etc/log4perl.conf (+13 lines)
Line 0 Link Here
1
log4perl.logger.intranet = DEBUG, INTRANET
2
log4perl.appender.INTRANET=Log::Log4perl::Appender::File
3
log4perl.appender.INTRANET.filename=__LOG_DIR__/intranet-error.log
4
log4perl.appender.INTRANET.mode=append
5
log4perl.appender.INTRANET.layout=PatternLayout
6
log4perl.appender.INTRANET.layout.ConversionPattern=[%d] [%p] %m %l %n
7
8
log4perl.logger.opac = DEBUG, OPAC
9
log4perl.appender.OPAC=Log::Log4perl::Appender::File
10
log4perl.appender.OPAC.filename=__LOG_DIR__/opac-error.log
11
log4perl.appender.OPAC.mode=append
12
log4perl.appender.OPAC.layout=PatternLayout
13
log4perl.appender.OPAC.layout.ConversionPattern=[%d] [%p] %m %l %n
(-)a/svc/renew (-1 / +2 lines)
Lines 28-33 use C4::Auth qw(check_cookie_auth); Link Here
28
28
29
use Koha::DateUtils qw(output_pref dt_from_string);
29
use Koha::DateUtils qw(output_pref dt_from_string);
30
30
31
C4::Context->interface('intranet');
32
31
my $input = new CGI;
33
my $input = new CGI;
32
34
33
my ( $auth_status, $sessionID ) =
35
my ( $auth_status, $sessionID ) =
34
- 

Return to bug 14167