sidekiq-haron 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5923fbd63614f0aa5187a2f36b9f41672ca2187fd5d88bf65a88d62e6327ab04
-  data.tar.gz: 3764c82c4b824bfdd88b4c8f294183de5d6d44a77649eb03bce8fbfb2088a3c2
+  metadata.gz: a903c22b5c1696535db961a28828fa539cebb6695154b4082fb10fd3041f2c53
+  data.tar.gz: 9e405c2c5a4e5266d2cd735b13f6dc10c918d35bebda275e690e21b79b491e63
 SHA512:
-  metadata.gz: 38d80470789efa5020c68231b285fe4e980ab53ff6eee82b638b3183c7eef5dc887e924da63ddd86c4db317f1d1c564bc25b085e7b521f6ed820637badfa99c8
-  data.tar.gz: 9a35b3807b96f9d5e40a04d4441a4dbf00630399401d90794c88670fe53a01f9b7d7a673dfd443756e24241a29c3955b245672154c1b740eb4289944ecd6a4aa
+  metadata.gz: f3259615f6d5ad26bd53dd1a1f9a934d2f4b1c0ba4099be5062b58dbd103731fff12f0951cac8bc64564d1016b33d721b096980e8419c7f02ab65ab84383dd4a
+  data.tar.gz: 5a86580af78520badd3c3a75a9ac4ebb464a7b408b49f497188f82841aa54a41a5a0ce4e1d33b17776954de6e2fdd7d2b38d056d7836c819c1bf04ecf7d5a7c5

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-Аdd to project class  inheriting from `Sidekiq::Haron::Transmitter` like this:
+Аdd to project class inheriting from `Sidekiq::Haron::Transmitter` like this:
 
 ```ruby
 class HaronTransmitter < Sidekiq::Haron::Transmitter
@@ -53,9 +53,9 @@ Sidekiq::Haron.install(HaronTransmitter)
 Now all your sidekiq log have `Current.parent_request_id` value as tag and log job args too:
 
 ```
-2020-01-14T14:22:09.035Z  TestWorker JID-940645f14b345b3b4031d1cc I: [4f445354] with args [1, {"q"=>2}]
-2020-01-14T14:22:09.035Z  TestWorker JID-940645f14b345b3b4031d1cc I: [4f445354] start
-2020-01-14T14:22:09.041Z  TestWorker JID-940645f14b345b3b4031d1cc I: [4f445354] done: 0.006 sec
+2020-01-14T14:22:09.035Z class=TestWorker jid=940645f14b345b3b4031d1cc I: [4f445354] with args [1, {"q"=>2}]
+2020-01-14T14:22:09.035Z class=TestWorker jid=940645f14b345b3b4031d1cc I: [4f445354] start
+2020-01-14T14:22:09.041Z class=TestWorker jid=940645f14b345b3b4031d1cc elapsed=0.006 I: [4f445354] done
 ```
 
 ## Development

data/lib/sidekiq/haron/exception_logger.rb

@@ -1,17 +1,12 @@
-require 'sidekiq/exception_handler'
 module Sidekiq
   module Haron
-    class ExceptionLogger < Sidekiq::ExceptionHandler::Logger
+    class ExceptionLogger
 
-      def self.install
-        Sidekiq.error_handlers.delete_if{|eh| eh.is_a? Sidekiq::ExceptionHandler::Logger }
-        Sidekiq.error_handlers.unshift Sidekiq::Haron::ExceptionLogger.new
-      end
+      def call(ex, ctx_hash, config)
+        jid = ctx_hash.present? && ctx_hash[:job]['jid']
 
-      def call(ex, ctxHash)
-        jid = ctxHash.present? && ctxHash[:job]['jid']
         Sidekiq::Haron.transmitter.load(jid) if jid.present?
-        Sidekiq::Haron.transmitter.tagged{ super(ex, ctxHash) }
+        Sidekiq::Haron.transmitter.tagged{ Sidekiq.logger.warn ex.message }
       end
 
     end

data/lib/sidekiq/haron/formatter.rb

@@ -1,16 +1,16 @@
 module Sidekiq
   module Haron
-    class Formatter < Sidekiq::Logging::Pretty
-  
+    class Formatter < Sidekiq::Logger::Formatters::Pretty
+
       def call(severity, time, program_name, message)
-        result = "#{context} #{severity.to_s[0]}: #{message}\n"
+        result = "#{format_context} #{severity.to_s[0]}: #{message}\n"
         if ENV['RAILS_LOG_TO_STDOUT'].present?
           result
         else
           "#{time.utc.iso8601(3)} #{result}"
         end
       end
-      
+
     end
   end
 end

data/lib/sidekiq/haron/job_logger.rb

@@ -5,12 +5,12 @@ module Sidekiq
 
       def call(item, queue)
         Sidekiq::Haron.transmitter.load(item['jid'])
-        Sidekiq::Haron.transmitter.tagged do 
+        Sidekiq::Haron.transmitter.tagged do
           Sidekiq.logger.info("with args #{item['args'].inspect}")
           super
         end
       end
-      
+
     end
   end
 end

data/lib/sidekiq/haron/storage.rb

@@ -8,9 +8,23 @@ module Sidekiq
 
       def store_for_id(id, data, redis_pool=nil)
         redis_connection(redis_pool) do |conn|
-          conn.multi do
-            conn.hmset  key(id), *(data.to_a.flatten(1))
-            conn.expire key(id), DEFAULT_EXPIRY
+          conn.multi do |pipeline|
+            # При попытке записи хэша с полями nil, true, false
+            # валится задание с исключением "Unsupported command argument type: NilClass/TrueClass/FalseClass (TypeError)"
+            # Пример из консоли Rails (такое же поведение в "бою", данные взяты из реальных кейсов)
+            # d = [ :request_id, "9c30943e299135b1fe826d7be6195e78", :parent_request_id, "9c30943e",:user_id, nil ]
+            # Sidekiq.redis { |c| c.call('hmset', "kkk", d) }
+            # ~/.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.expire key(id), DEFAULT_EXPIRY
           end[0]
         end
       end

data/lib/sidekiq/haron/transmitter.rb

@@ -23,8 +23,8 @@ module Sidekiq
       end
 
       def tagged
-        ::Rails.logger.tagged(tags) do 
-          Sidekiq.logger.tagged(tags) do 
+        ::Rails.logger.tagged(tags) do
+          Sidekiq.logger.tagged(tags) do
             yield
           end
         end

data/lib/sidekiq/haron/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Haron
-    VERSION = "0.1.6"
+    VERSION = "0.2.0"
   end
 end

data/lib/sidekiq/haron.rb

@@ -12,16 +12,16 @@ module Sidekiq
   module Haron
 
     def self.transmitter
-      Sidekiq.options[:transmitter]
+      @transmitter
     end
 
     def self.transmitter= v
-      Sidekiq.options[:transmitter] = v
+      @transmitter = v
     end
 
-    def self.install transmitter_class
+    def self.install transmitter_class, with_tagged_logging: true
       Sidekiq::Haron.transmitter = transmitter_class.new
-      set_loggers
+      set_loggers with_tagged_logging
       Sidekiq.configure_server do |c|
         configure_client_middleware(c)
         configure_server_middleware(c)
@@ -31,11 +31,14 @@ module Sidekiq
       end
     end
 
-    def self.set_loggers
-      Sidekiq.options[:job_logger] = Sidekiq::Haron::JobLogger
-      Sidekiq.logger.formatter = Sidekiq::Haron::Formatter.new
-      Sidekiq.logger = ActiveSupport::TaggedLogging.new(Sidekiq.logger)
-      Sidekiq::Haron::ExceptionLogger.install
+    def self.set_loggers with_tagged_logging
+      Sidekiq.configure_server do |config|
+        config.logger.formatter = Sidekiq::Haron::Formatter.new
+        config.logger = ActiveSupport::TaggedLogging.new(Sidekiq.logger) if with_tagged_logging
+
+        config[:job_logger] = Sidekiq::Haron::JobLogger
+        config.error_handlers << Sidekiq::Haron::ExceptionLogger.new
+      end
     end
 
     def self.configure_client_middleware(sidekiq_config)

data/sidekiq-haron.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sidekiq", "~> 5.2"
-  spec.add_dependency "rails"
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_dependency "sidekiq", "~> 7.3.0"
+  spec.add_dependency "rails", '~> 7.0'
+  spec.add_development_dependency "bundler", "~> 2.5.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "awesome_print"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-haron
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Serg F
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2024-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 7.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 7.3.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ homepage: https://github.com/Rnd-Soft/sidekiq-haron
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Transfer some data to sidekiq job and can tag sidekiq logs
 test_files: []