ezlog 0.10.0 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 522f8d12a7a34a7aa83c51c6729dd212909979a3c0db32ad622436056be3ea03
-  data.tar.gz: ebf173e4431cb016de8e6a14b418b71106221982d3ebc082d53b2ed0a31fd3b5
+  metadata.gz: 5a89b74f63f86ae29c07305e46bf13c8947b182e191e47e3f62b7e44871e29b2
+  data.tar.gz: 4fdfa0f12bd2b3329cedbf07a141bae85d33e4330bf0b09cd1f56dec5222e76d
 SHA512:
-  metadata.gz: c9efef1e23b6b8b77689d513665676aad77340d04131ca6241b565ac2cf7e8e78f21dbb0adf8ea06ce2a76008b12d7d350cbd7ea35de6d2228367b486bbda7b8
-  data.tar.gz: 14a749943851eadf758f2e71f0a9680f9af86c2b2895e5a946918d50696fe1f19ccacb090b37f40935d972150fb18af1d6602bb93b711917a471b8d8b4ced249
+  metadata.gz: 7b7803f8b7d10219752ec93b7f5a462bc34a299047f7f1216673850d1d59ee4211ed4b459427f8b041e6e6dc937abe7a9b2073aadc97077d15b06a6c4ca708cf
+  data.tar.gz: 6dac05cf4c985db51560b8191bdb8f33ddfd6645a846d6d5e145184500b9dae8218ca9c9006ff005b2e672373ae4fe8252e2e19e31b356943ad80d85f625fa5c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.10.1 (2022-01-22)
+
+[Full Changelog](https://github.com/emartech/ezlog/compare/v0.10.0...v0.10.1)
+
+* Fix
+  * Fixed a bug where `ActionView::LogSubscriber` was potentially not (eager)loaded by the time we tried to detach it.
+    With this fix Rails 6.1 running on Ruby 3 should be fully supported.
+
 ### 0.10.0 (2021-07-01)
 
 [Full Changelog](https://github.com/emartech/ezlog/compare/v0.9.6...v0.10.0)

data/lib/ezlog/railtie.rb

@@ -42,7 +42,10 @@ module Ezlog
       case ::Rails::VERSION::MAJOR
       when 6
         ::ActionController::LogSubscriber.detach_from :action_controller
-        ::ActionView::LogSubscriber.detach_from :action_view
+        if defined? ::ActionView
+          require 'action_view/log_subscriber' unless defined? ::ActionView::LogSubscriber
+          ::ActionView::LogSubscriber.detach_from :action_view
+        end
         if defined? ::ActiveRecord
           ::ActiveRecord::LogSubscriber.detach_from :active_record
           Ezlog::Rails::LogSubscriber.attach Ezlog::Rails::ActiveRecord::LogSubscriber, :active_record
@@ -70,7 +73,9 @@ module Ezlog
       ::Sidekiq.configure_server do |config|
         config.options[:job_logger] = Ezlog::Sidekiq::JobLogger
         config.error_handlers << Ezlog::Sidekiq::ErrorLogger.new
-        config.error_handlers.delete_if { |handler| handler.is_a? ::Sidekiq::ExceptionHandler::Logger }
+        if defined?(::Sidekiq::ExceptionHandler) && defined?(::Sidekiq::ExceptionHandler::Logger)
+          config.error_handlers.delete_if { |handler| handler.is_a? ::Sidekiq::ExceptionHandler::Logger }
+        end
         config.death_handlers << Ezlog::Sidekiq::DeathLogger.new
       end
     end

data/lib/ezlog/sidekiq/job_logger.rb

@@ -5,14 +5,18 @@ module Ezlog
     class JobLogger
       include LogContextHelper
 
+      def initialize(logger = ::Sidekiq.logger)
+        @logger = logger
+      end
+
       def call(job_hash, _queue)
         within_log_context(JobContext.from_job_hash(job_hash)) do
           begin
-            logger.info "#{job_hash['class']} started"
+            @logger.info "#{job_hash['class']} started"
             benchmark { yield }
-            logger.info message: "#{job_hash['class']} finished"
+            @logger.info message: "#{job_hash['class']} finished"
           rescue Exception
-            logger.info message: "#{job_hash['class']} failed"
+            @logger.info message: "#{job_hash['class']} failed"
             raise
           end
         end
@@ -23,11 +27,11 @@ module Ezlog
       end
 
       def prepare(job_hash, &_block)
-        old_log_level = logger.level
-        logger.level = job_hash['log_level'] || logger.level
+        old_log_level = @logger.level
+        @logger.level = job_hash['log_level'] || @logger.level
         yield
       ensure
-        logger.level = old_log_level
+        @logger.level = old_log_level
       end
 
       private
@@ -39,10 +43,6 @@ module Ezlog
         end_time = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
         add_to_log_context duration_sec: (end_time - start_time).round(3)
       end
-
-      def logger
-        ::Sidekiq.logger
-      end
     end
   end
 end

data/lib/ezlog/version.rb

@@ -1,3 +1,3 @@
 module Ezlog
-  VERSION = '0.10.0'
+  VERSION = '0.10.3'
 end

data/repo-info.json

@@ -0,0 +1,7 @@
+{
+  "is_in_production": true,
+  "is_scannable": true,
+  "is_critical": false,
+  "contact": "g-gsuite-smartinsight@emarsys.com",
+  "hosted": null
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezlog
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.3
 platform: ruby
 authors:
 - Zoltan Ormandi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
@@ -136,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: 
+description:
 email:
 - zoltan.ormandi@emarsys.com
 executables: []
@@ -172,12 +172,13 @@ files:
 - lib/ezlog/sidekiq/job_logger.rb
 - lib/ezlog/version.rb
 - lib/sequel/extensions/ezlog_logging.rb
+- repo-info.json
 homepage: https://github.com/emartech/ezlog
 licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/emartech/ezlog/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,8 +193,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A zero-configuration logging solution for projects using Sidekiq, Rails,
   Sequel, etc.