effective_logging 3.1.7 → 3.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c41ed5f5f39a3dc24c63161bf07ea763351a611bee78aceb325c5a09126b5f60
-  data.tar.gz: fb4bc4163aca3521fcf0bfa23a8253950743fd16696224911d8b431dd1f37cf0
+  metadata.gz: 776c1106826280f8941053f903533221832f31ff27a9d10539d3c87592901751
+  data.tar.gz: c1bb69734cb95ad4b697f95a6a941454d5b95786c76a0da7e8c60ec549b732f4
 SHA512:
-  metadata.gz: 171973db5f9b0be2b3e2e91923df44767ed9cf787c629833370bbfb45ee8d31301edb6e5a2212768825a1742a87bd39a84915045a5badabded05cb66fc86ff1a
-  data.tar.gz: b858a335ca8fc2f780fdfb5c056078ea40a0113d6f19078942a179fb54c690cf3ab9f090ec684a94d7e1d4d51cdf51b4622b2af1a3efc0c38ceccd469c340aca
+  metadata.gz: 90861c78a3b12000910586f4f1dd9d6b7762a3aaf39f6ec2fced0288cb7eb8242f27fc4c6f88f77e55f2dd7e67b76ddca55f66596d62edc3da81a006bd91c648
+  data.tar.gz: c3377cb8d5894847d2e0a6dbc692706262a14e38fb53f47758cee716145d6d8529a676952eea8e9f112d7e5781571a2d83963a45e56f73f0f4e5d3a7e63e9a98

data/lib/effective_logging.rb

@@ -3,8 +3,6 @@ require 'effective_logging/engine'
 require 'effective_logging/version'
 
 module EffectiveLogging
-  mattr_accessor :supressed
-
   def self.config_keys
     [
       :logs_table_name, :layout, :additional_statuses,
@@ -47,6 +45,11 @@ module EffectiveLogging
     Thread.current[:effective_logging_current_user]
   end
 
+  # Used to supress all logging
+  def self.supressed=(value)
+    Thread.current[:effective_logging_supressed] = value
+  end
+
   def self.supressed(&block)
     Thread.current[:effective_logging_supressed] = true
     yield

data/lib/effective_logging/active_storage_logger.rb

@@ -4,6 +4,8 @@ module EffectiveLogging
   module ActiveStorageLogger
 
     def track_downloads
+      return if EffectiveLogging.supressed?
+
       user = current_user if respond_to?(:current_user)
 
       key = decode_verified_key()

data/lib/effective_logging/email_logger.rb

@@ -28,7 +28,7 @@ module EffectiveLogging
 
       # Pass a tenant to your mailer
       # mail(to: 'admin@example.com', subject: @post.title, tenant: Tenant.current)
-      tenant = if message.header['tenant'].present? && defined?(Tenant)
+      tenant = if message.header['tenant'].present?
         value = message.header['tenant'].to_s.to_sym # OptionalField, not a String here
         message.header['tenant'] = nil
         value
@@ -41,7 +41,9 @@ module EffectiveLogging
 
       fields[:email] = "#{message.header}<hr>#{body}"
 
-      if tenant.present?
+      if defined?(Tenant) && Tenant.current.present?
+        log_email(message, fields, user_klass)
+      elsif defined?(Tenant) && tenant.present?
         Tenant.as(tenant) { log_email(message, fields, user_klass) }
       else
         log_email(message, fields, user_klass)

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '3.1.7'.freeze
+  VERSION = '3.1.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.8
 platform: ruby
 authors:
 - Code and Effect