sidekiq-haron 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a903c22b5c1696535db961a28828fa539cebb6695154b4082fb10fd3041f2c53
-  data.tar.gz: 9e405c2c5a4e5266d2cd735b13f6dc10c918d35bebda275e690e21b79b491e63
+  metadata.gz: '0148c001b7a4205ea94c032b93d3e0cbab26649b577697acf70234090bb940e5'
+  data.tar.gz: 279fdf3e1b0190c0f36d17894604aee602528816e75de8920d36dcbdaed54854
 SHA512:
-  metadata.gz: f3259615f6d5ad26bd53dd1a1f9a934d2f4b1c0ba4099be5062b58dbd103731fff12f0951cac8bc64564d1016b33d721b096980e8419c7f02ab65ab84383dd4a
-  data.tar.gz: 5a86580af78520badd3c3a75a9ac4ebb464a7b408b49f497188f82841aa54a41a5a0ce4e1d33b17776954de6e2fdd7d2b38d056d7836c819c1bf04ecf7d5a7c5
+  metadata.gz: ee05561b2f488778fd91ae59446b403db97babae7f569cc43502dd5f93e3a7110e1daea05113d1fb8df2676296060f9043b0bc50ef9e85c5687b5f527b2781ef
+  data.tar.gz: d190c12325c125ded418ef2662fb6907a31907f32179345a1af8a734afc6cc13e6c741a674b1e11044c0f98b39fb29e21597d9c60f9f11365a41d215eb9fc860

data/lib/monkey_patching/active_support/broadcast_logger_patcher.rb

@@ -0,0 +1,26 @@
+module MonkeyPatching
+  module ActiveSupport
+    module  BroadcastLoggerPatcher
+      private
+
+      def method_missing(name, ...)
+        loggers = if name == :tagged
+                    # only this way reimplemented
+                    @broadcasts.select { |logger| !logger.is_a? ::Sidekiq::Logger }
+                  else
+                    @broadcasts.select { |logger| logger.respond_to?(name) }
+                  end
+
+        if loggers.none?
+          super
+        elsif loggers.one?
+          loggers.first.send(name, ...)
+        else
+          loggers.map { |logger| logger.send(name, ...) }
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport::BroadcastLogger.prepend MonkeyPatching::ActiveSupport::BroadcastLoggerPatcher

data/lib/sidekiq/haron/redis_converts.rb

@@ -0,0 +1,42 @@
+module Sidekiq
+  module Haron
+    module Storage
+      module RedisConverts
+        # Введена интерпретация значений nil, true, false в связи с возникающими ошибками:
+        #   nil   - 'NilClass'
+        #   true  - 'TrueClass'
+        #   false - 'FalseClass'
+
+        CLASSES_TO_CONVERT  = { NilClass  => {redis_value: 'NilClass',    orig_value: nil},
+                              TrueClass   => {redis_value: 'TrueClass',   orig_value: true},
+                              FalseClass  => {redis_value: 'FalseClass',  orig_value: false} }.freeze
+
+        def encode_values_from array
+          return array unless array.is_a?(Array)
+
+          array.map do |value|
+            CLASSES_TO_CONVERT.keys.include?(value.class) ? CLASSES_TO_CONVERT[value.class][:redis_value] : value
+          end
+        end
+
+        def decode_values_from hash
+          return hash unless hash.is_a?(Hash)
+
+          hash.transform_values do |value|
+            key = key_by_redis_value(value)
+            value = key.nil? ? value : CLASSES_TO_CONVERT[key][:orig_value]
+          end
+        end
+
+        private
+
+        def key_by_redis_value redis_value
+          CLASSES_TO_CONVERT.each do |k, v|
+            return k if v[:redis_value] == redis_value
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/sidekiq/haron/storage.rb

@@ -2,6 +2,8 @@ module Sidekiq
   module Haron
     module Storage
 
+      include RedisConverts
+
       DEFAULT_EXPIRY = 7 * 24 * 60 * 60 # 7 days
 
       protected
@@ -17,13 +19,8 @@ module Sidekiq
             # ~/.rvm/gems/ruby-3.3.5/gems/irb-1.14.1/lib/irb.rb:1260:in `full_message': Unsupported command argument type: NilClass (TypeError)
             # raise TypeError, "Unsupported command argument type: #{element.class}"
             #       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-            # Потому введена интерпретация значений:
-            #   nil   - ''
-            #   true  - 1
-            #   false - 0
-            values = data.to_a.flatten(1).map{ |each| each.nil? ? '' : each }.map{ |each| each == true ? 1 : (each == false ? 0 : each) }
             # уход от deprecated-предупреждений внутри sidekiq - нативный вызов hmset для клиента redis
-            pipeline.call('hmset', key(id), *(values))
+            pipeline.call('hmset', key(id), *(encode_values_from data.to_a.flatten(1)))
             pipeline.expire key(id), DEFAULT_EXPIRY
           end[0]
         end
@@ -31,7 +28,7 @@ module Sidekiq
 
       def read_for_id(id)
         Sidekiq.redis do |conn|
-          conn.hgetall(key(id))
+          decode_values_from conn.hgetall(key(id))
         end
       end
 

data/lib/sidekiq/haron/transmitter.rb

@@ -23,12 +23,15 @@ module Sidekiq
       end
 
       def tagged
-        ::Rails.logger.tagged(tags) do
-          Sidekiq.logger.tagged(tags) do
-            yield
+        if ::Rails.logger.respond_to?(:tagged) && Sidekiq.logger.respond_to?(:tagged)
+          ::Rails.logger.tagged(tags) do
+            Sidekiq.logger.tagged(tags) do
+              yield
+            end
           end
+        else
+          yield
         end
-
       end
 
       def tags

data/lib/sidekiq/haron/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Haron
-    VERSION = "0.2.0"
+    VERSION = "0.2.2".freeze
   end
 end

data/lib/sidekiq/haron.rb

@@ -1,5 +1,6 @@
 require 'sidekiq'
 require 'sidekiq/haron/formatter'
+require 'sidekiq/haron/redis_converts'
 require 'sidekiq/haron/storage'
 require 'sidekiq/haron/transmitter'
 require 'sidekiq/haron/job_logger'
@@ -7,6 +8,7 @@ require 'sidekiq/haron/exception_logger'
 require 'sidekiq/haron/client_middleware'
 require 'sidekiq/haron/server_middleware'
 require 'sidekiq/haron/version'
+require 'monkey_patching/active_support/broadcast_logger_patcher'
 
 module Sidekiq
   module Haron

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-haron
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Serg F
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 2025-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -110,11 +110,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/monkey_patching/active_support/broadcast_logger_patcher.rb
 - lib/sidekiq/haron.rb
 - lib/sidekiq/haron/client_middleware.rb
 - lib/sidekiq/haron/exception_logger.rb
 - lib/sidekiq/haron/formatter.rb
 - lib/sidekiq/haron/job_logger.rb
+- lib/sidekiq/haron/redis_converts.rb
 - lib/sidekiq/haron/server_middleware.rb
 - lib/sidekiq/haron/storage.rb
 - lib/sidekiq/haron/transmitter.rb