Lines 48-79
our $log = undef;
Link Here
|
48 |
sub new { |
48 |
sub new { |
49 |
my ( $proto, $params ) = @_; |
49 |
my ( $proto, $params ) = @_; |
50 |
|
50 |
|
51 |
return $log if $log and ( not defined $params->{file} or not defined $log->{FILE_PATH} or $params->{file} eq $log->{FILE_PATH} ); |
51 |
return $log |
52 |
my $class = ref($proto) || $proto; |
52 |
if $log |
53 |
my $self = {}; |
53 |
and ( not defined $params->{file} |
|
|
54 |
or not defined $log->{FILE_PATH} |
55 |
or $params->{file} eq $log->{FILE_PATH} ); |
56 |
my $class = ref($proto) || $proto; |
57 |
my $self = {}; |
54 |
my $LOG_PATH = defined $ENV{KOHA_LOG} ? $ENV{KOHA_LOG} : undef; |
58 |
my $LOG_PATH = defined $ENV{KOHA_LOG} ? $ENV{KOHA_LOG} : undef; |
55 |
$self->{FILE_PATH} = defined $params->{file} ? $params->{file} : $LOG_PATH; |
59 |
$self->{FILE_PATH} = defined $params->{file} ? $params->{file} : $LOG_PATH; |
56 |
$self->{LEVEL} = defined $params->{level} ? $params->{level} : $INFO_LOG_LEVEL; |
60 |
$self->{LEVEL} = defined $params->{level} ? $params->{level} : $INFO_LOG_LEVEL; |
|
|
61 |
$self->{LOGGED_MESSAGES} = []; |
62 |
|
57 |
if ( not defined $self->{FILE_PATH} ) { |
63 |
if ( not defined $self->{FILE_PATH} ) { |
58 |
return bless($self, $class); |
64 |
return bless( $self, $class ); |
59 |
} |
65 |
} |
60 |
eval { |
66 |
eval { $self->{LOGGER} = Log::LogLite->new( $self->{FILE_PATH}, $self->{LEVEL} ); }; |
61 |
$self->{LOGGER} = Log::LogLite->new($self->{FILE_PATH}, $self->{LEVEL}); |
|
|
62 |
}; |
63 |
die "Log system is not correctly configured ($@)" if $@; |
67 |
die "Log system is not correctly configured ($@)" if $@; |
64 |
return bless( $self, $class ); |
68 |
return bless( $self, $class ); |
65 |
} |
69 |
} |
66 |
|
70 |
|
67 |
sub write { |
71 |
sub write { |
68 |
my ($self, $msg, $log_level, $dump, $cb) = @_; |
72 |
my ( $self, $msg, $log_level, $dump, $cb ) = @_; |
69 |
|
73 |
|
70 |
if ( not $self->{LOGGER} ) { |
74 |
if ( not $self->{LOGGER} ) { |
71 |
if($log_level <= $self->{LEVEL}) { |
75 |
if ( $log_level <= $self->{LEVEL} ) { |
72 |
print STDERR "[" . localtime() . "] " |
76 |
print STDERR "[" . localtime() . "] " . "$LEVEL_STR->{$log_level}: " . $msg . ( $cb ? " (" . $cb . ")" : "" ) . "\n"; |
73 |
. "$LEVEL_STR->{$log_level}: " |
|
|
74 |
. $msg |
75 |
. ( $cb ? " (" . $cb . ")" : "" ) |
76 |
. "\n"; |
77 |
} |
77 |
} |
78 |
return; |
78 |
return; |
79 |
} |
79 |
} |
Lines 82-145
sub write {
Link Here
|
82 |
$template .= "\n"; |
82 |
$template .= "\n"; |
83 |
$self->{LOGGER}->template($template); |
83 |
$self->{LOGGER}->template($template); |
84 |
$msg = "\n" . Dumper $msg if $dump; |
84 |
$msg = "\n" . Dumper $msg if $dump; |
85 |
$self->{LOGGER}->write($msg, $log_level); |
85 |
$self->{LOGGER}->write( $msg, $log_level ); |
|
|
86 |
|
87 |
if ( $log_level <= $self->{LEVEL} ) { |
88 |
my $message = "[" . localtime() . "] " . "$LEVEL_STR->{$log_level}: " . $msg . ( $cb ? " (" . $cb . ")" : "" ) . "\n"; |
89 |
push( @{ $self->{LOGGED_MESSAGES} }, $message ); |
90 |
} |
86 |
} |
91 |
} |
87 |
|
92 |
|
88 |
sub unusable { |
93 |
sub unusable { |
89 |
my ($self, $msg, $dump) = @_; |
94 |
my ( $self, $msg, $dump ) = @_; |
90 |
my $cb = $self->called_by(); |
95 |
my $cb = $self->called_by(); |
91 |
$self->write($msg, $UNUSABLE_LOG_LEVEL, $dump, $cb); |
96 |
$self->write( $msg, $UNUSABLE_LOG_LEVEL, $dump, $cb ); |
92 |
} |
97 |
} |
93 |
|
98 |
|
94 |
sub critical { |
99 |
sub critical { |
95 |
my ($self, $msg, $dump) = @_; |
100 |
my ( $self, $msg, $dump ) = @_; |
96 |
my $cb = $self->called_by(); |
101 |
my $cb = $self->called_by(); |
97 |
$self->write($msg, $CRITICAL_LOG_LEVEL, $dump, $cb); |
102 |
$self->write( $msg, $CRITICAL_LOG_LEVEL, $dump, $cb ); |
98 |
} |
103 |
} |
99 |
|
104 |
|
100 |
sub error { |
105 |
sub error { |
101 |
my ($self, $msg, $dump) = @_; |
106 |
my ( $self, $msg, $dump ) = @_; |
102 |
my $cb = $self->called_by(); |
107 |
my $cb = $self->called_by(); |
103 |
$self->write($msg, $ERROR_LOG_LEVEL, $dump, $cb); |
108 |
$self->write( $msg, $ERROR_LOG_LEVEL, $dump, $cb ); |
104 |
} |
109 |
} |
105 |
|
110 |
|
106 |
sub warning { |
111 |
sub warning { |
107 |
my ($self, $msg, $dump) = @_; |
112 |
my ( $self, $msg, $dump ) = @_; |
108 |
my $cb = $self->called_by(); |
113 |
my $cb = $self->called_by(); |
109 |
$self->write($msg, $WARNING_LOG_LEVEL, $dump, $cb); |
114 |
$self->write( $msg, $WARNING_LOG_LEVEL, $dump, $cb ); |
110 |
} |
115 |
} |
111 |
|
116 |
|
112 |
sub log { |
117 |
sub log { |
113 |
my ($self, $msg, $dump) = @_; |
118 |
my ( $self, $msg, $dump ) = @_; |
114 |
$self->write($msg, $NORMAL_LOG_LEVEL, $dump); |
119 |
$self->write( $msg, $NORMAL_LOG_LEVEL, $dump ); |
115 |
} |
120 |
} |
116 |
|
121 |
|
117 |
sub normal { |
122 |
sub normal { |
118 |
my ($self, $msg, $dump) = @_; |
123 |
my ( $self, $msg, $dump ) = @_; |
119 |
$self->write($msg, $NORMAL_LOG_LEVEL, $dump); |
124 |
$self->write( $msg, $NORMAL_LOG_LEVEL, $dump ); |
120 |
} |
125 |
} |
121 |
|
126 |
|
122 |
sub info { |
127 |
sub info { |
123 |
my ($self, $msg, $dump) = @_; |
128 |
my ( $self, $msg, $dump ) = @_; |
124 |
$self->write($msg, $INFO_LOG_LEVEL, $dump); |
129 |
$self->write( $msg, $INFO_LOG_LEVEL, $dump ); |
125 |
} |
130 |
} |
126 |
|
131 |
|
127 |
sub debug { |
132 |
sub debug { |
128 |
my ($self, $msg, $dump) = @_; |
133 |
my ( $self, $msg, $dump ) = @_; |
129 |
$self->write($msg, $DEBUG_LOG_LEVEL, $dump); |
134 |
$self->write( $msg, $DEBUG_LOG_LEVEL, $dump ); |
130 |
} |
135 |
} |
131 |
|
136 |
|
132 |
sub level { |
137 |
sub level { |
133 |
my $self = shift; |
138 |
my $self = shift; |
134 |
|
139 |
|
135 |
return $self->{LOGGER} |
140 |
return $self->{LOGGER} |
136 |
? $self->{LOGGER}->level(@_) |
141 |
? $self->{LOGGER}->level(@_) |
137 |
: ($self->{LEVEL} = @_ ? shift : $self->{LEVEL}); |
142 |
: ( $self->{LEVEL} = @_ ? shift : $self->{LEVEL} ); |
138 |
} |
143 |
} |
139 |
|
144 |
|
140 |
|
|
|
141 |
sub called_by { |
145 |
sub called_by { |
142 |
my $self = shift; |
146 |
my $self = shift; |
143 |
my $depth = 2; |
147 |
my $depth = 2; |
144 |
my $args; |
148 |
my $args; |
145 |
my $pack; |
149 |
my $pack; |
Lines 154-168
sub called_by {
Link Here
|
154 |
my $bitmask; |
158 |
my $bitmask; |
155 |
my @subr; |
159 |
my @subr; |
156 |
my $str = ""; |
160 |
my $str = ""; |
|
|
161 |
|
157 |
while (1) { |
162 |
while (1) { |
158 |
($pack, $file, $line, $subr, $has_args, $wantarray, $evaltext, |
163 |
( $pack, $file, $line, $subr, $has_args, $wantarray, $evaltext, $is_require, $hints, $bitmask ) = caller($depth); |
159 |
$is_require, $hints, $bitmask) = caller($depth); |
164 |
unless ( defined($subr) ) { |
160 |
unless (defined($subr)) { |
|
|
161 |
last; |
165 |
last; |
162 |
} |
166 |
} |
163 |
$depth++; |
167 |
$depth++; |
164 |
$line = (3) ? "$file:".$line."-->" : ""; |
168 |
$line = (3) ? "$file:" . $line . "-->" : ""; |
165 |
push(@subr, $line.$subr); |
169 |
push( @subr, $line . $subr ); |
166 |
} |
170 |
} |
167 |
@subr = reverse(@subr); |
171 |
@subr = reverse(@subr); |
168 |
foreach my $sr (@subr) { |
172 |
foreach my $sr (@subr) { |
Lines 171-176
sub called_by {
Link Here
|
171 |
} |
175 |
} |
172 |
$str =~ s/ > $/: /; |
176 |
$str =~ s/ > $/: /; |
173 |
return $str; |
177 |
return $str; |
174 |
} # of called_by |
178 |
} # of called_by |
|
|
179 |
|
180 |
sub get_messages { |
181 |
my $self = shift; |
182 |
|
183 |
return $self->{LOGGED_MESSAGES}; |
184 |
} |
175 |
|
185 |
|
176 |
1; |
186 |
1; |