sidekiq-amigo 1.1.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8980dca10a4706347222badd39dbd267466d6b5add00eaba00e25181467b4964
-  data.tar.gz: 48f7d54c1d104fdafbcc1eb27367084d89c6b77dbf71c1256f30faf88f3b0a10
+  metadata.gz: 2e2d1d241003c4a1c17556826b5b99e9fdd055f09fc223febbace5cf43486fa7
+  data.tar.gz: 4da7f543a69ea5095e4eb404d3b609ff7cf6c2dfbfbfdde47f447ddf2704c86a
 SHA512:
-  metadata.gz: 5660f11c1f9f76603e61fdc2f3dbbd16031c32871dce14f587990a5ab076e4573311483d322d58bea4cef392764ae4a6bf663945a23356782c04a8b805075417
-  data.tar.gz: fd2303da8f7c9c9cd0ea279b4ab2913a1e4ae4c817bad60c2ef9c7541213d7783b8843843a3112b68dab5a1c99d107fc870b86db29bd8c6598b0f095cf6e1b37
+  metadata.gz: bb1c2d403a07c2ebd16b9b73121076a8ab7a3248f6bd37c160b1ceb3b163be8f402818a9136a87716af112beed5967a0002400d6e1f87e305d5f5e08570da0b6
+  data.tar.gz: b8b10de08c0e8d1e13aa01eabd5593feee71e98058e99ceb17d774cd30bf7ccc41bb860aeaa09293017ad2581a0672e6babdb292b2ecc8cfefff707da5f5cd40

data/lib/amigo/deprecated_jobs.rb

@@ -32,7 +32,7 @@ class Amigo
     def self.noop_class
       cls = Class.new do
         def _perform(*)
-          Amigo.log(self, :warn, "deprecated_job_invoked", nil)
+          Amigo.log(self, :warn, "deprecated_job_invoked", {})
         end
       end
       cls.extend(Amigo::Job)

data/lib/amigo/spec_helpers.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require "sidekiq/testing"
-
 require "amigo"
 
 class Amigo
   module SpecHelpers
     def self.included(context)
-      Sidekiq::Testing.inline!
       context.before(:each) do |example|
         Amigo.synchronous_mode = true if example.metadata[:async]
       end

data/lib/amigo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Amigo
-  VERSION = "1.1.0"
+  VERSION = "1.1.3"
 end

data/lib/amigo.rb

@@ -107,8 +107,11 @@ class Amigo
 
     # Proc called with [job, level, message, params].
     # By default, logs to the job's logger (or Sidekiq's if job is nil).
-    # If structured_logging is true, the message will be an 'event' without any dynamic info,
-    # if false, the params will be rendered into the message so are suitable for unstructured logging.
+    # If structured_logging is true, the message will be an 'event' string (like 'registered_subscriber')
+    # without any dynamic info.
+    # If structured_logging is false, the params will be rendered into the message
+    # so are suitable for unstructured logging. Also, the params will also have an :log_message key
+    # which will contain the original log message.
     attr_accessor :log_callback
 
     def reset_logging
@@ -117,8 +120,10 @@ class Amigo
     end
 
     def log(job, level, message, params)
-      if self.structured_logging
+      params ||= {}
+      if !self.structured_logging && !params.empty?
         paramstr = params.map { |k, v| "#{k}=#{v}" }.join(" ")
+        params[:log_message] = message
         message = "#{message} #{paramstr}"
       end
       self.log_callback[job, level, message, params]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-amigo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Lithic Technology
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq