memolog 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc86adaf5e01b9b3a99f65effc344c4c00b8e9d8d2d869bb6fc0bc1f83682050
-  data.tar.gz: d9bcfb39881184b1165fab899e00e4275bdc6277d7ec403d12f894883204bace
+  metadata.gz: 26a1f1133c9b055600c33a91d7c53f59adb80c6d4965d655a5202114d69f770b
+  data.tar.gz: bce4c804aec15718d38cb9e73ce9866861676dfa2f2c59d9c3c50e6dd67330de
 SHA512:
-  metadata.gz: ef444d32eb36d93d9019971cd70beb33ac812281962919da3113ef66b6c8eefb36786fded4d4b026270220f5faedf2c438ee807b02124b4a9f6cdc7427b95fa6
-  data.tar.gz: cbee42fa97849f3ae874099c8847a8823c0226ff48bc37884b15b31f037998fe1ec5b822ce91d998ea1c0b9d6cd7d006c7bf258b297d7080d89dda36c0f5fe3e
+  metadata.gz: 9ba992c3aae9358737c56c3154d1ebf88007abb26e8b8bcc8225e9a2d9cbc500c01e63b9de6cb4e456e79e067692d36988b87dc30f78fee8ed4abc04f9977ccd
+  data.tar.gz: 7c757c5e1b80e846434acc435f4bd5141f483d5c056cb10b837977b62a8acc7795ce5e00bcd6e120a0514c035b6d6dd5cc7d4fe5c586e3831c4b5656362fe30e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    memolog (0.5.1)
+    memolog (0.5.2)
       json (~> 2)
       logger (~> 1.4.3)
       securerandom (~> 0.1.0)
@@ -9,67 +9,67 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actioncable (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activejob (= 7.0.7.2)
-      activerecord (= 7.0.7.2)
-      activestorage (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actionmailbox (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      actionview (= 7.0.7.2)
-      activejob (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actionmailer (7.0.8)
+      actionpack (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.7.2)
-      actionview (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activerecord (= 7.0.7.2)
-      activestorage (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actiontext (7.0.8)
+      actionpack (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.7.2)
-      activesupport (= 7.0.7.2)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.7.2)
-      activesupport (= 7.0.7.2)
+    activejob (7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.3.6)
-    activemodel (7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activerecord (7.0.7.2)
-      activemodel (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activestorage (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activejob (= 7.0.7.2)
-      activerecord (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activerecord (7.0.8)
+      activemodel (= 7.0.8)
+      activesupport (= 7.0.8)
+    activestorage (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activesupport (= 7.0.8)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.7.2)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -100,7 +100,7 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.5)
-    minitest (5.19.0)
+    minitest (5.20.0)
     net-imap (0.3.7)
       date
       net-protocol
@@ -108,7 +108,7 @@ GEM
       net-protocol
     net-protocol (0.2.1)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
     nokogiri (1.15.4-arm64-darwin)
@@ -128,20 +128,20 @@ GEM
     rack (2.2.8)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.7.2)
-      actioncable (= 7.0.7.2)
-      actionmailbox (= 7.0.7.2)
-      actionmailer (= 7.0.7.2)
-      actionpack (= 7.0.7.2)
-      actiontext (= 7.0.7.2)
-      actionview (= 7.0.7.2)
-      activejob (= 7.0.7.2)
-      activemodel (= 7.0.7.2)
-      activerecord (= 7.0.7.2)
-      activestorage (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    rails (7.0.8)
+      actioncable (= 7.0.8)
+      actionmailbox (= 7.0.8)
+      actionmailer (= 7.0.8)
+      actionpack (= 7.0.8)
+      actiontext (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activemodel (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       bundler (>= 1.15.0)
-      railties (= 7.0.7.2)
+      railties (= 7.0.8)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -149,9 +149,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.0.7.2)
-      actionpack (= 7.0.7.2)
-      activesupport (= 7.0.7.2)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -187,7 +187,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
+    rubocop-capybara (2.19.0)
       rubocop (~> 1.41)
     rubocop-config-umbrellio (1.50.0.85)
       rubocop (~> 1.50.0)
@@ -212,7 +212,7 @@ GEM
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
     securerandom (0.1.1)
-    sidekiq (7.1.2)
+    sidekiq (7.1.5)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
@@ -221,11 +221,11 @@ GEM
     timeout (0.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   arm64-darwin-22

data/lib/memolog/config.rb

@@ -3,13 +3,15 @@
 Memolog::Config = Struct.new(
   :debug,
   :formatter,
-  :middlewares,
+  :isolation_level,
   :log_size_limit,
+  :middlewares,
 ) do
   def initialize
     self.debug = false
     self.formatter = Logger::Formatter.new
-    self.middlewares = %i[rails sidekiq]
+    self.isolation_level = :thread
     self.log_size_limit = 50_000
+    self.middlewares = %i[rails sidekiq]
   end
 end

data/lib/memolog/logger_extension.rb

@@ -2,12 +2,12 @@
 
 module Memolog::LoggerExtension
   def add(*args, &block)
-    Memolog.logger.log(*args, &block)
+    Memolog.log(*args, &block)
     super
   end
 
   def log(*args, &block)
-    Memolog.logger.log(*args, &block)
+    Memolog.log(*args, &block)
     super
   end
 end

data/lib/memolog/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Memolog
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/memolog.rb

@@ -31,14 +31,6 @@ module Memolog
     other_logger.extend(Memolog::LoggerExtension)
   end
 
-  def logger
-    Thread.current[:memolog_logger] ||= Logger.new(nil, formatter: config.formatter)
-  end
-
-  def logdevs
-    Thread.current[:memolog_logdevs] ||= []
-  end
-
   def run
     logdevs.push(StringIO.new)
     logger.instance_variable_set(:@logdev, logdevs.last)
@@ -48,6 +40,10 @@ module Memolog
     logdevs.pop unless config.debug
   end
 
+  def log(*args, &block)
+    logger.log(*args, &block)
+  end
+
   def dump(parse_json: false)
     return if logdevs.empty?
 
@@ -60,4 +56,18 @@ module Memolog
   rescue JSON::ParserError
     dump
   end
+
+  private
+
+  def logger
+    storage[:memolog_logger] ||= Logger.new(nil, formatter: config.formatter)
+  end
+
+  def logdevs
+    storage[:memolog_logdevs] ||= []
+  end
+
+  def storage
+    config.isolation_level == :fiber ? Fiber : Thread.current
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: memolog
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Stepan Kirushkin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json