sidekiq-repeat 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 640363fb32bb0a5e6c6d7b9ce47109bb4d26244e
-  data.tar.gz: 43481093dd233b479c4fa4c5809cee3b547911d2
+SHA256:
+  metadata.gz: 1d46671c4ad696a61604b109d4b6fdb3971a2ed698c4f2533a8610efdc60e0db
+  data.tar.gz: f3c7c93ba4c3ce80849861bbf692d43cabcb3c1cf8aad6ad67740bb598c0e637
 SHA512:
-  metadata.gz: 2957cc62da166c65fc5ea481a39a903d6a6e2a533aa3f4b0a81171a0975b9d0ce253b995bdd3d9a61b4e729d4d7cb1252c515346750840e04c66955af3eed0b5
-  data.tar.gz: cb43747010d8c0aa4243a4d8d161270d54d4b2e19a75acb2dd9f446415157d70047bfa889a3e5ff61187abd7be7905019bf8e50abc88bb5cc7be36ab17e2727c
+  metadata.gz: 205587c667edec2a887cfc34bc1b718ce658d179d6574466567fc3f6dc0b0ba79325988b3613b7d4b9c434951bde976d06be9f638ae154b9f00578f16b7d5ac3
+  data.tar.gz: 3281aadd5d49ece99453e720e0cf254988dd96a9e8a2e1ae985b01bdd256d9b56a8c69d1d0d65e26ad592340587e38667c0d589d9ec94d3a402efd3d56258f97

data/lib/sidekiq-repeat.rb

@@ -6,6 +6,8 @@ Sidekiq.configure_server do |config|
   end
 
   config.on(:startup) do
-    Sidekiq::Repeat::Repeatable.reschedule_all
+    Sidekiq::Repeat::Configuration.with_lock do
+      Sidekiq::Repeat::Repeatable.reschedule_all
+    end
   end
 end

data/lib/sidekiq/repeat.rb

@@ -1,8 +1,18 @@
 require 'parse-cron'
+require 'redlock'
 require 'sidekiq'
 require 'sidekiq/api'
 
+require 'sidekiq/repeat/configuration'
 require 'sidekiq/repeat/middleware'
 require 'sidekiq/repeat/mini_ice_cube'
 require 'sidekiq/repeat/repeatable'
 require 'sidekiq/repeat/version'
+
+module Sidekiq
+  module Repeat
+    def self.configure
+      yield Configuration.instance
+    end
+  end
+end

data/lib/sidekiq/repeat/configuration.rb

@@ -0,0 +1,31 @@
+require 'singleton'
+
+module Sidekiq
+  module Repeat
+    class Configuration
+      include Singleton
+
+      def initialize
+        reset_to_default!
+      end
+
+      def reset_to_default!
+        @redlock_enabled          = true
+        @redlock_redis_instances  = ['redis://localhost:6379']
+      end
+
+      attr_accessor :redlock_enabled
+      attr_accessor :redlock_redis_instances
+
+      def self.with_lock
+        if instance.redlock_enabled
+          Redlock::Client.new(instance.redlock_redis_instances).lock('sidekiq-repeat-reschedule-all', 500) do
+            yield
+          end
+        else
+          yield
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/repeat/repeatable.rb

@@ -3,28 +3,42 @@ module Sidekiq
     module Repeatable
       module ClassMethods
         def repeat(&block)
-          @cronline = MiniIceCube::MainDsl.new.instance_eval(&block).to_s
+          @block = block
+        end
+
+        def cronline
+          return @cronline if @cronline
+          return if @block.nil?
+          @cronline = MiniIceCube::MainDsl.new.instance_eval(&@block).to_s
           @cronline = CronParser.new(@cronline)
+
         rescue ArgumentError
           fail "repeat '#{@cronline}' in class #{self.name} is not a valid cron line"
         end
 
         def reschedule
-          return unless repeat_configured?
-          return if     already_scheduled?
+          # Only if repeat is configured.
+          return unless !!cronline
 
-          ts = @cronline.next
-          self.perform_at ts.to_f
-          Sidekiq.logger.info "Scheduled #{self.name} for #{ts}."
-        end
+          ts   = cronline.next
+          args = [Time.now.to_f, ts.to_f].take(instance_method(:perform).arity)
+          nj   = next_scheduled_job
 
-        def repeat_configured?
-          !!@cronline
+          if nj
+            if nj.at > ts
+              nj.item['args'] = args
+              nj.reschedule ts.to_f
+              Sidekiq.logger.info "Re-scheduled #{self.name} for #{ts}."
+            end
+          else
+            self.perform_at ts.to_f, *args
+            Sidekiq.logger.info "Scheduled #{self.name} for #{ts}."
+          end
         end
 
-        def already_scheduled?
+        def next_scheduled_job
           @ss ||= Sidekiq::ScheduledSet.new
-          @ss.any? { |job| job.klass == self.name }
+          @ss.find { |job| job.klass == self.name }
         end
       end
 

data/lib/sidekiq/repeat/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Repeat
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-repeat
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
-- FlavourSys Technology GmbH
+- Projective Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: parse-cron
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: redlock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -54,32 +74,47 @@ dependencies:
         version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '1.3'
 description: This gem adds recurring jobs to Sidekiq. It is heavily inspired by the
   sidekiq-dejavu and sidetiq gems.
-email: technology@flavoursys.com
+email: technology@projective.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/sidekiq-repeat.rb
 - lib/sidekiq/repeat.rb
+- lib/sidekiq/repeat/configuration.rb
 - lib/sidekiq/repeat/middleware.rb
 - lib/sidekiq/repeat/mini_ice_cube.rb
 - lib/sidekiq/repeat/repeatable.rb
 - lib/sidekiq/repeat/version.rb
-homepage: https://github.com/FlavourSys/sidekiq-repeat
+homepage: https://github.com/projectivetech/sidekiq-repeat
 licenses:
 - MIT
 metadata: {}
@@ -98,8 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Repeat is a clockless recurring job system for Sidekiq.