[freeside-commits] branch master updated. 86eb93c5a82f7c7613e33eefe20aae1bad6bcb69

[Mitch Jackson]

The branch, master has been updated
       via  86eb93c5a82f7c7613e33eefe20aae1bad6bcb69 (commit)
      from  0d13c4c4823794e26725303bc730d7f7d59ef4fb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 86eb93c5a82f7c7613e33eefe20aae1bad6bcb69
Author: Mitch Jackson <mitch at freeside.biz>
Date:   Sat Oct 27 23:42:55 2018 -0400

    RT# 38217 Fix substitutions for System Log email template

diff --git a/FS/FS/log.pm b/FS/FS/log.pm
index 88b82217f..875e1ac01 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,
       },
     );

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/log.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)