sidekiq-amigo 1.0.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5204accb28834a6d5cb0baf274aa92e96f8ab2480316d6578c1e35e31075f44
-  data.tar.gz: c397ff5a38053be56726310f8b5e4e1b934c85c84f17fa60bb636e6d4b477252
+  metadata.gz: 1ad3126cf6ef41459f944083e16b5c64a83a59e2df2617e238112b608c9d545c
+  data.tar.gz: c53b63fa0b89f7d5f8f7c84f9199ae23941aa400991d8835d0f11e272060fc13
 SHA512:
-  metadata.gz: 04ce08ea274cf3132db350ecf826787e594faa47e1905fbc61307156d6b87f6a33b5301c05acf2b88b21aff52d600e52ae7cc31dd83f53e72ac972c5c2b56e0e
-  data.tar.gz: e46d7aab0d27953b1d16903cb98d77e8b8ddcbe56ea091950c76bdf60c18e3207cc085dc2c87e3f0e78c2f7e310325d4de8492c3d73f04babdcbf0a53be2a3f9
+  metadata.gz: e4e05313b891b464942f591bf63ab199bc586dff134779581621364a93e928014bc2f96f5184d1df367d1f2ef1be7e4a36b5af12351daca6fc9e7da723577221
+  data.tar.gz: 53b8a94510e1396c5fc779d36c9eeccb379ca02b11f5b9cc71822565b0b88874c381fda32c854e9addc664f1c08ec46ebafc6c5c9833f2f566140ae6c56b0fed

data/lib/amigo/audit_logger.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "amigo/job"
+require "amigo"
 
 class Amigo
   class AuditLogger

data/lib/amigo/deprecated_jobs.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "amigo"
 require "amigo/job"
 
 # Put jobs here to die. If you just remove a job in Sidekiq, it may be queued up
@@ -31,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/job.rb

@@ -2,11 +2,11 @@
 
 require "sidekiq"
 
+require "amigo"
+
 class Amigo
   module Job
     def self.extended(cls)
-      Amigo.registered_jobs << cls
-
       cls.include(Sidekiq::Worker)
       cls.extend(ClassMethods)
       cls.pattern = ""

data/lib/amigo/router.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require "amigo/job"
+require "sidekiq"
+
+require "amigo"
 
 class Amigo
   class Router

data/lib/amigo/scheduled_job.rb

@@ -8,8 +8,6 @@ require "amigo"
 class Amigo
   module ScheduledJob
     def self.extended(cls)
-      Amigo.registered_jobs << cls
-
       cls.include(Sidekiq::Worker)
       cls.sidekiq_options(retry: false)
       cls.extend(ClassMethods)

data/lib/amigo/spec_helpers.rb

@@ -1,11 +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.0.0"
+  VERSION = "1.1.2"
 end

data/lib/amigo.rb

@@ -98,10 +98,9 @@ require "sidekiq-cron"
 # Splay defaults to 30s; you may wish to always provide splay, whatever you think for your job.
 #
 class Amigo
-  require "amigo/job"
-  require "amigo/scheduled_job"
-  require "amigo/audit_logger"
-  require "amigo/router"
+  class Error < StandardError; end
+
+  class StartSchedulerFailed < Error; end
 
   class << self
     attr_accessor :structured_logging
@@ -118,7 +117,8 @@ 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(" ")
         message = "#{message} #{paramstr}"
       end
@@ -180,6 +180,8 @@ class Amigo
     # Install Amigo so that every publish will be sent to the AuditLogger job
     # and will invoke the relevant jobs in registered_jobs via the Router job.
     def install_amigo_jobs
+      require "amigo/audit_logger"
+      require "amigo/router"
       return self.register_subscriber do |ev|
         self._subscriber(ev)
       end
@@ -190,21 +192,25 @@ class Amigo
       Amigo::AuditLogger.perform_async(event_json)
       Amigo::Router.perform_async(event_json)
     end
-    #
-    # # Start the scheduler.
-    # # This should generally be run in the Sidekiq worker process,
-    # # not a webserver process.
-    # def self.start_scheduler
-    #   hash = self.scheduled_jobs.each_with_object({}) do |job, memo|
-    #     self.logger.info "Scheduling %s every %p" % [job.name, job.cron_expr]
-    #     memo[job.name] = {
-    #       "class" => job.name,
-    #       "cron" => job.cron_expr,
-    #     }
-    #   end
-    #   load_errs = Sidekiq::Cron::Job.load_from_hash hash
-    #   raise "Errors loading sidekiq-cron jobs: %p" % [load_errs] if load_errs.present?
-    # end
+
+    def register_job(job)
+      self.registered_jobs << job
+    end
+
+    # Start the scheduler.
+    # This should generally be run in the Sidekiq worker process,
+    # not a webserver process.
+    def start_scheduler(load_from_hash=Sidekiq::Cron::Job.method(:load_from_hash))
+      hash = self.registered_scheduled_jobs.each_with_object({}) do |job, memo|
+        self.log(nil, :info, "scheduling_job_cron", {job_name: job.name, job_cron: job.cron_expr})
+        memo[job.name] = {
+          "class" => job.name,
+          "cron" => job.cron_expr,
+        }
+      end
+      load_errs = load_from_hash.call(hash) || {}
+      raise StartSchedulerFailed, "Errors loading sidekiq-cron jobs: %p" % [load_errs] unless load_errs.empty?
+    end
   end
 
   class Event

metadata

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