projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 74789 - updated format to handle credits in seperated batch files
[freeside.git]
/
FS
/
FS
/
log.pm
diff --git
a/FS/FS/log.pm
b/FS/FS/log.pm
index
d432ee3
..
875e1ac
100644
(file)
--- a/
FS/FS/log.pm
+++ b/
FS/FS/log.pm
@@
-4,6
+4,7
@@
use strict;
use base qw( FS::Record );
use FS::Record qw( qsearch qsearchs dbdef );
use FS::UID qw( dbh driver_name );
use base qw( FS::Record );
use FS::Record qw( qsearch qsearchs dbdef );
use FS::UID qw( dbh driver_name );
+use FS::Log;
use FS::log_context;
use FS::log_email;
use FS::upgrade_journal;
use FS::log_context;
use FS::log_email;
use FS::upgrade_journal;
@@
-47,8
+48,7
@@
this will be set to that agentnum.
=item tablenum - foreign key to that table.
=item tablenum - foreign key to that table.
-=item level - log level: 'debug', 'info', 'notice', 'warning', 'error',
-'critical', 'alert', 'emergency'.
+=item level - log level: 'debug', 'info', 'warning', 'error', 'critical',
=item message - contents of the log entry
=item message - contents of the log entry
@@
-83,6
+83,7
@@
sub insert {
my $self = shift;
my $error = $self->SUPER::insert;
return $error if $error;
my $self = shift;
my $error = $self->SUPER::insert;
return $error if $error;
+
my $contexts = {}; # for quick checks when sending emails
my $context_height = @_; # also for email check
foreach ( @_ ) { # ordered from least to most specific
my $contexts = {}; # for quick checks when sending emails
my $context_height = @_; # also for email check
foreach ( @_ ) { # ordered from least to most specific
@@
-94,6
+95,7
@@
sub insert {
return $error if $error;
$contexts->{$_} = $context_height--;
}
return $error if $error;
$contexts->{$_} = $context_height--;
}
+
foreach my $log_email (
qsearch('log_email',
{
foreach my $log_email (
qsearch('log_email',
{
@@
-114,11
+116,11
@@
sub insert {
next;
}
my $emailerror = $msg_template->send(
next;
}
my $emailerror = $msg_template->send(
- 'msgtype'
=> 'admin',
- 'to'
=> $log_email->to_addr,
+ 'msgtype' => 'admin',
+ 'to' => $log_email->to_addr,
'substitutions' => {
'substitutions' => {
- 'loglevel' => $FS::Log::LEVELS{$self->level}
, # which has hopefully been loaded...
- 'logcontext' =>
$log_email->context, # use the one that triggered the email
+ 'loglevel' => $FS::Log::LEVELS{$self->level}
|| 'unknown',
+ 'logcontext' =>
join(', ', keys( %$contexts )) || 'unknown',
'logmessage' => $self->message,
},
);
'logmessage' => $self->message,
},
);