diff options
author | Mitch Jackson <mitch@freeside.biz> | 2018-10-27 23:42:55 -0400 |
---|---|---|
committer | Mitch Jackson <mitch@freeside.biz> | 2018-10-27 23:45:27 -0400 |
commit | 9ecbe48e7226f9fe9b8b641d6fe7b3fddcd4bc1e (patch) | |
tree | 38a727a417825e594f327a71d15216ab53ad6764 /FS/FS/log.pm | |
parent | 8eac87da359ab1ff577c2118566f3976952dd1c3 (diff) |
RT# 38217 Fix substitutions for System Log email template
Diffstat (limited to 'FS/FS/log.pm')
-rw-r--r-- | FS/FS/log.pm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/FS/FS/log.pm b/FS/FS/log.pm index 88b8221..875e1ac 100644 --- 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 FS::Log; use FS::log_context; use FS::log_email; use FS::upgrade_journal; @@ -82,6 +83,7 @@ sub insert { 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 @@ -93,6 +95,7 @@ sub insert { return $error if $error; $contexts->{$_} = $context_height--; } + foreach my $log_email ( qsearch('log_email', { @@ -113,11 +116,11 @@ sub insert { next; } my $emailerror = $msg_template->send( - 'msgtype' => 'admin', - 'to' => $log_email->to_addr, + 'msgtype' => 'admin', + 'to' => $log_email->to_addr, '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, }, ); |