sidekiq-repeat 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 555a748fae5d290be3bb712ab440479dacf0c9fe
-  data.tar.gz: 8e2c7552fc996199993c6cfee732f094e2d8eb22
+  metadata.gz: e4ff40d93c6daa63b523d3397831deac8ec94772
+  data.tar.gz: 246c9d8f2ff0f408a74d5d7db58667d175ca71ff
 SHA512:
-  metadata.gz: d0f3e27069e456a46df3d0c9bf0e805c2572e1fe322ce252ea958f9aac386e88e945bccee700ba88e8046f6ec6e9942e7e53ac8faef1158131c14d28773c99df
-  data.tar.gz: 1ebb70fed3d51399368fbb7a67e566e6431751d06e3662884fd0fb654ad8d5a07ae2c6d2a640b59e725d7edfe84cbab39370d82271ab289f22c1734152a52358
+  metadata.gz: 5deeac2bb21d3e623df27f5b60e1c561417bd6af2283ecb42d30f7112a5b3c7ce47fe84c521bec0434bf4790ad5d5435db52a03553948a5e8ae285118947f1b8
+  data.tar.gz: cc125ebac8172201d4681d7220a791a03f2a405b8d1446edde9c73e0c6380947339bb9c400baff120f81e8b019c92c75b36b5f1a3db04240fe6744dd313fa563

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

@@ -10,26 +10,28 @@ module Sidekiq
         end
 
         def reschedule
-          return unless repeat_configured?
-          return if     already_scheduled?
-
-          ts = @cronline.next
-          args = repeat_arguments(ts)
-          self.perform_at ts.to_f, *args
-          Sidekiq.logger.info "Scheduled #{self.name} for #{ts}."
-        end
-
-        def repeat_arguments(ts)
-          [Time.now.to_f, ts.to_f].compact.take(instance_method(:perform).arity)
-        end
-
-        def repeat_configured?
-          !!@cronline
-        end
-
-        def already_scheduled?
+          # Only if repeat is configured.
+          return unless !!@cronline
+
+          ts   = @cronline.next
+          args = [Time.now.to_f, ts.to_f].take(instance_method(:perform).arity)
+          nj   = next_scheduled_job
+
+          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 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.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-repeat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -38,6 +38,26 @@ 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: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +95,7 @@ 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
@@ -104,3 +125,4 @@ signing_key:
 specification_version: 4
 summary: Repeat is a clockless recurring job system for Sidekiq.
 test_files: []
+has_rdoc: