sidekiq-haron 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5923fbd63614f0aa5187a2f36b9f41672ca2187fd5d88bf65a88d62e6327ab04
-  data.tar.gz: 3764c82c4b824bfdd88b4c8f294183de5d6d44a77649eb03bce8fbfb2088a3c2
+  metadata.gz: 60d3333333dc4a17fed71b555a3d39dabe3d6486a477fa8e4f0cdd0a34e5f3ff
+  data.tar.gz: eccedd18665a12f4d714549f1fcccdec0dd391751a8b57005f5a727b3819d8f8
 SHA512:
-  metadata.gz: 38d80470789efa5020c68231b285fe4e980ab53ff6eee82b638b3183c7eef5dc887e924da63ddd86c4db317f1d1c564bc25b085e7b521f6ed820637badfa99c8
-  data.tar.gz: 9a35b3807b96f9d5e40a04d4441a4dbf00630399401d90794c88670fe53a01f9b7d7a673dfd443756e24241a29c3955b245672154c1b740eb4289944ecd6a4aa
+  metadata.gz: a535916068755b1e71faeb264ad8852bade96e7f0f2de18f69e169e61d1e1eb46b1972ed37120b06e5dea7a0ac9450f76fb0086396dbbaa37c3cb6611037b7ea
+  data.tar.gz: 7dbb770b1b2d2b233dc0ef5126ee806c34294e59334de7e5a7fb6503033a53ec21b23cf2dbb0f3e1ef08e55119d6adc055c9329bb8735e0ab6c86426652247d8

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,12 +1,6 @@
-require 'sidekiq/exception_handler'
 module Sidekiq
   module Haron
-    class ExceptionLogger < Sidekiq::ExceptionHandler::Logger
-
-      def self.install
-        Sidekiq.error_handlers.delete_if{|eh| eh.is_a? Sidekiq::ExceptionHandler::Logger }
-        Sidekiq.error_handlers.unshift Sidekiq::Haron::ExceptionLogger.new
-      end
+    class ExceptionLogger
 
       def call(ex, ctxHash)
         jid = ctxHash.present? && ctxHash[:job]['jid']

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,9 @@ 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|
+            pipeline.hmset  key(id), *(data.to_a.flatten(1))
+            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.1.8"
   end
 end

data/lib/sidekiq/haron.rb

@@ -12,11 +12,11 @@ module Sidekiq
   module Haron
 
     def self.transmitter
-      Sidekiq.options[:transmitter]
+      Sidekiq[:transmitter]
     end
 
     def self.transmitter= v
-      Sidekiq.options[:transmitter] = v
+      Sidekiq[:transmitter] = v
     end
 
     def self.install transmitter_class
@@ -32,10 +32,12 @@ module Sidekiq
     end
 
     def self.set_loggers
-      Sidekiq.options[:job_logger] = Sidekiq::Haron::JobLogger
-      Sidekiq.logger.formatter = Sidekiq::Haron::Formatter.new
+      Sidekiq.configure_server do |config|
+        config.log_formatter = Sidekiq::Haron::Formatter.new
+      end
+      Sidekiq[:job_logger] = Sidekiq::Haron::JobLogger
+      Sidekiq[:error_handlers] << Sidekiq::Haron::ExceptionLogger.new
       Sidekiq.logger = ActiveSupport::TaggedLogging.new(Sidekiq.logger)
-      Sidekiq::Haron::ExceptionLogger.install
     end
 
     def self.configure_client_middleware(sidekiq_config)

data/sidekiq-haron.gemspec

@@ -23,7 +23,7 @@ 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 "sidekiq", "~> 6.5.12"
   spec.add_dependency "rails"
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 12.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-haron
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Serg F
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2024-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.5.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.5.12
 - !ruby/object:Gem::Dependency
   name: rails
   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: []