From 793113e437c711b726f3b2fefb3091ff93ddd4d7 Mon Sep 17 00:00:00 2001 From: Mitch Jackson Date: Sat, 27 Oct 2018 22:19:55 -0400 Subject: [PATCH] RT# 38217 Fix substitutions for System Log email template --- FS/FS/log.pm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/FS/FS/log.pm b/FS/FS/log.pm index 75e17c847..67a74d196 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; @@ -81,9 +82,11 @@ Will send emails according to the conditions in L. sub insert { # not using process_o2m for this, because we don't have a web interface my $self = shift; + my $error = $self->SUPER::insert; return $error if $error; - my $contexts = {}; #for quick checks when sending emails + + my $contexts = {}; foreach ( @_ ) { my $context = FS::log_context->new({ 'lognum' => $self->lognum, @@ -93,6 +96,7 @@ sub insert { return $error if $error; $contexts->{$_} = 1; } + foreach my $log_email ( qsearch('log_email', { @@ -112,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, }, ); -- 2.20.1