sidekiq-cron 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14e517dfc5120f0566a60c0aa5a3b8e68d714dca
-  data.tar.gz: d68e25c487348b2c473b854d3c2d70c31a17dc56
+  metadata.gz: b058d0c5b73a34aed14caeb7f42f28160211d85c
+  data.tar.gz: 63e67fe94aca427cb37924ef6510e255f3525a85
 SHA512:
-  metadata.gz: f75f115a12fff61f49b0f5e659c61ddb32307f6cbcf95768b4264b036889897ece81084edc79cad35b8424eb5da8732e55ce40cc32eb85fedbf27134a1bc5150
-  data.tar.gz: 1326115dd62fce5b842fed9fde09dcadc9fe917169a038c8309777524526dffc67d2945b36f6fadc72f965b0f312c62ad950c6016094cc535dd68e946d12ff66
+  metadata.gz: cbf9eb136c8490a8d8eabd88fd4709df9f157835bf5ca4decf8b847f458efed8fb148b296b268c051ad5679187f6cf70df5d6482e1c113a0ece9ad5214690a76
+  data.tar.gz: 64baadd70d279c95b8d2381b29cd4c0f9f9097166a47f0f1b4a9cac5130943ee8041ec34b2fcdc00608fa924dfa9c6b0c5f760b169315fb5039b2c8fd81c819e

data/.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 rvm:
-  - jruby-19mode
-  - rbx-19mode
-  - 2.0.0
+  - 2.3.1
   - 2.2.2
 services:
   - redis-server

data/Gemfile

@@ -2,12 +2,12 @@ source 'https://rubygems.org'
 
 gem 'sidekiq', '>= 4.2.1'
 gem 'rufus-scheduler', '>= 3.3.0'
-gem 'redis-namespace', '>= 1.5.2'
 
 group :development do
   gem 'bundler'
   gem 'simplecov'
 
+  gem 'redis-namespace', '>= 1.5.2'
   gem 'shoulda-context'
 
   gem 'rack'

data/README.md

@@ -281,6 +281,10 @@ When you start the Sidekiq process, it starts one thread with `Sidekiq::Poller`
 
 Sidekiq-Cron adds itself into this start procedure and starts another thread with `Sidekiq::Cron::Poller` which checks all enabled Sidekiq cron jobs every 10 seconds, if they should be added to queue (their cronline matches time of check).
 
+Sidekiq-Cron is checking jobs to be enqueued every 30s by default, you can change it by setting:
+```
+Sidekiq.options[:poll_interval] = 10
+```
 
 ## Thanks to
 * [@7korobi](https://github.com/7korobi)

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/lib/sidekiq/cron/job.rb

@@ -68,7 +68,7 @@ module Sidekiq
           end
         end
 
-        save
+        save_last_enqueue_time
         logger.debug { "enqueued #{@name}: #{@message}" }
       end
 
@@ -451,6 +451,13 @@ module Sidekiq
         logger.info { "Cron Jobs - add job with name: #{@name}" }
       end
 
+      def save_last_enqueue_time
+        Sidekiq.redis do |conn|
+          # update last enqueue time
+          conn.hset redis_key, 'last_enqueue_time', @last_enqueue_time
+        end
+      end
+
       # remove job from cron jobs by name
       # input:
       #   first arg: name (string) - name of job (must be same - case sensitive)

data/lib/sidekiq/cron/locales/en.yml

@@ -3,7 +3,12 @@ en:
   Cron: Cron
   CronJobs: Cron Jobs
   EnqueueNow: Enqueue Now
+  EnableAll: Enable All
+  DisableAll: Disable All
+  EnqueueAll: Enqueue All
+  DeleteAll: Delete All
   'Cron string': Cron
+  AreYouSureDeleteCronJobs: Are you sure you want to delete ALL cron jobs?
   AreYouSureDeleteCronJob: Are you sure you want to delete the %{job} cron job?
   NoCronJobsFound: "No cron jobs found"
   Enable: Enable

data/lib/sidekiq/cron/poller.rb

@@ -5,6 +5,8 @@ require 'sidekiq/scheduled'
 
 module Sidekiq
   module Cron
+    POLL_INTERVAL = 30
+
     # The Poller checks Redis every N seconds for sheduled cron jobs
     class Poller < Sidekiq::Scheduled::Poller
       def enqueue
@@ -28,6 +30,10 @@ module Sidekiq
         logger.error "CRON JOB: #{ex.message}"
         logger.error "CRON JOB: #{ex.backtrace.first}"
       end
+
+      def poll_interval_average
+         Sidekiq.options[:poll_interval] || POLL_INTERVAL
+      end
     end
   end
 end

data/lib/sidekiq/cron/views/cron.erb

@@ -1,8 +1,27 @@
 <header class='row'>
-  <div class='span5 col-sm-5'>
+  <div class='col-sm-5 pull-left'>
     <h3><%=t 'CronJobs' %></h3>
   </div>
+  <div class='col-sm-7 pull-right' style="margin-top: 20px; margin-bottom: 10px;">
+    <form action="<%= root_path %>cron/__all__/delete" method="post" class="pull-right">
+      <%= csrf_tag if respond_to?(:csrf_tag) %>
+      <input class="btn btn-small btn-danger" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSureDeleteCronJobs') %>">
+    </form>
+    <form action="<%= root_path %>cron/__all__/disable" method="post" class="pull-right">
+      <%= csrf_tag if respond_to?(:csrf_tag) %>
+      <input class="btn btn-small" type="submit" name="enque" value="<%= t('DisableAll') %>" />
+    </form>
+    <form action="<%= root_path %>cron/__all__/enable" method="post" class="pull-right">
+      <%= csrf_tag if respond_to?(:csrf_tag) %>
+      <input class="btn btn-small" type="submit" name="enque" value="<%= t('EnableAll') %>" />
+    </form>
+    <form action="<%= root_path %>cron/__all__/enque" method="post" class="pull-right">
+      <%= csrf_tag if respond_to?(:csrf_tag) %>
+      <input class="btn btn-small" type="submit" name="enque" value="<%= t('EnqueueAll') %>" />
+    </form>
+  </div>
 </header>
+
 <% if @cron_jobs.size > 0 %>
 
   <table class="table table-hover table-bordered table-striped table-white">

data/lib/sidekiq/cron/views/cron.slim

@@ -1,6 +1,21 @@
 header.row
-  .span5
+  .span.col-sm-5.pull-left
     h3 = t('CronJobs')
+
+  .span.col-sm-7.pull-right style="margin-top: 20px; margin-bottom: 10px;"
+    form.pull-right action="#{root_path}cron/__all__/delete" method="post"
+      = csrf_tag if respond_to?(:csrf_tag)
+      input.btn.btn-small.pull-left.btn-danger type="submit" name="enque" value="#{t('DeleteAll')}" data-confirm="#{t('AreYouSureDeleteCronJobs')}"
+    form.pull-right action="#{root_path}cron/__all__/disable" method="post"
+      = csrf_tag if respond_to?(:csrf_tag)
+      input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('DisableAll')}"
+    form.pull-right action="#{root_path}cron/__all__/enable" method="post"
+      = csrf_tag if respond_to?(:csrf_tag)
+      input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnableAll')}"
+    form.pull-right action="#{root_path}cron/__all__/enque" method="post"
+      = csrf_tag if respond_to?(:csrf_tag)
+      input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueAll')}"
+
 - if @cron_jobs.size > 0
 
   table class="table table-hover table-bordered table-striped"

data/lib/sidekiq/cron/web_extension.rb

@@ -22,7 +22,9 @@ module Sidekiq
 
         #enque cron job
         app.post '/cron/:name/enque' do
-          if job = Sidekiq::Cron::Job.find(route_params[:name])
+          if route_params[:name] === '__all__'
+            Sidekiq::Cron::Job.all.each(&:enque!)
+          elsif job = Sidekiq::Cron::Job.find(route_params[:name])
             job.enque!
           end
           redirect "#{root_path}cron"
@@ -30,7 +32,9 @@ module Sidekiq
 
         #delete schedule
         app.post '/cron/:name/delete' do
-          if job = Sidekiq::Cron::Job.find(route_params[:name])
+          if route_params[:name] === '__all__'
+            Sidekiq::Cron::Job.all.each(&:destroy)
+          elsif job = Sidekiq::Cron::Job.find(route_params[:name])
             job.destroy
           end
           redirect "#{root_path}cron"
@@ -38,7 +42,9 @@ module Sidekiq
 
         #enable job
         app.post '/cron/:name/enable' do
-          if job = Sidekiq::Cron::Job.find(route_params[:name])
+          if route_params[:name] === '__all__'
+            Sidekiq::Cron::Job.all.each(&:enable!)
+          elsif job = Sidekiq::Cron::Job.find(route_params[:name])
             job.enable!
           end
           redirect "#{root_path}cron"
@@ -46,7 +52,9 @@ module Sidekiq
 
         #disable job
         app.post '/cron/:name/disable' do
-          if job = Sidekiq::Cron::Job.find(route_params[:name])
+          if route_params[:name] === '__all__'
+            Sidekiq::Cron::Job.all.each(&:disable!)
+          elsif job = Sidekiq::Cron::Job.find(route_params[:name])
             job.disable!
           end
           redirect "#{root_path}cron"

data/sidekiq-cron.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sidekiq-cron 0.5.1 ruby lib
+# stub: sidekiq-cron 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron"
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Ondrej Bartas"]
-  s.date = "2017-04-13"
+  s.date = "2017-04-18"
   s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
     "lib/sidekiq/cron/web.rb",
     "lib/sidekiq/cron/web_extension.rb",
     "sidekiq-cron.gemspec",
+    "test/integration/performance_test.rb",
     "test/test_helper.rb",
     "test/unit/job_test.rb",
     "test/unit/poller_test.rb",
@@ -60,9 +61,9 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sidekiq>, [">= 4.2.1"])
       s.add_runtime_dependency(%q<rufus-scheduler>, [">= 3.3.0"])
-      s.add_runtime_dependency(%q<redis-namespace>, [">= 1.5.2"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<redis-namespace>, [">= 1.5.2"])
       s.add_development_dependency(%q<shoulda-context>, [">= 0"])
       s.add_development_dependency(%q<rack>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
@@ -78,9 +79,9 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<sidekiq>, [">= 4.2.1"])
       s.add_dependency(%q<rufus-scheduler>, [">= 3.3.0"])
-      s.add_dependency(%q<redis-namespace>, [">= 1.5.2"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<redis-namespace>, [">= 1.5.2"])
       s.add_dependency(%q<shoulda-context>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
@@ -97,9 +98,9 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<sidekiq>, [">= 4.2.1"])
     s.add_dependency(%q<rufus-scheduler>, [">= 3.3.0"])
-    s.add_dependency(%q<redis-namespace>, [">= 1.5.2"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<redis-namespace>, [">= 1.5.2"])
     s.add_dependency(%q<shoulda-context>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])

data/test/integration/performance_test.rb

@@ -0,0 +1,52 @@
+# -*- encoding : utf-8 -*-
+require './test/test_helper'
+require 'benchmark'
+
+describe 'Perfromance Poller' do
+  X = 10000
+  before do
+    Sidekiq.redis = REDIS
+    Sidekiq.redis do |conn|
+      conn.flushdb
+    end
+
+    #clear all previous saved data from redis
+    Sidekiq.redis do |conn|
+      conn.keys("cron_job*").each do |key|
+        conn.del(key)
+      end
+    end
+
+    args = {
+      queue: "default",
+      cron: "*/2 * * * *",
+      klass: "CronTestClass"
+    }
+
+    X.times do |i|
+      Sidekiq::Cron::Job.create(args.merge(name: "Test#{i}"))
+    end
+
+    @poller = Sidekiq::Cron::Poller.new
+    now = Time.now.utc
+    enqueued_time = Time.new(now.year, now.month, now.day, now.hour + 1, 10, 5)
+    Time.stubs(:now).returns(enqueued_time)
+  end
+
+  it 'should enqueue 10000 jobs in less than 30s' do
+    Sidekiq.redis do |conn|
+      assert_equal 0, conn.llen("queue:default"), 'Queue should be empty'
+    end
+
+    bench = Benchmark.measure {
+      @poller.enqueue
+    }
+
+    Sidekiq.redis do |conn|
+      assert_equal X, conn.llen("queue:default"), 'Queue should be full'
+    end
+
+    puts "Perfomance test finished in #{bench.real}"
+    assert_operator 30, :>, bench.real
+  end
+end

data/test/unit/web_extension_test.rb

@@ -66,6 +66,14 @@ describe 'Cron web' do
       @cron_job_name = "TesQueueNameOfCronJob"
     end
 
+    it "disable and enable all cron jobs" do
+      post "/cron/__all__/disable"
+      assert_equal Sidekiq::Cron::Job.find(@name).status, "disabled"
+
+      post "/cron/__all__/enable"
+      assert_equal Sidekiq::Cron::Job.find(@name).status, "enabled"
+    end
+
     it "disable and enable cron job" do
       post "/cron/#{@name}/disable"
       assert_equal Sidekiq::Cron::Job.find(@name).status, "disabled"
@@ -74,6 +82,19 @@ describe 'Cron web' do
       assert_equal Sidekiq::Cron::Job.find(@name).status, "enabled"
     end
 
+    it "enqueue all jobs" do
+      Sidekiq.redis do |conn|
+        assert_equal 0, conn.llen("queue:default"), "Queue should have no jobs"
+      end
+
+      post "/cron/__all__/enque"
+
+      Sidekiq.redis do |conn|
+        assert_equal 1, conn.llen("queue:default"), "Queue should have 1 job in default"
+        assert_equal 1, conn.llen("queue:cron"), "Queue should have 1 job in cron"
+      end
+    end
+
     it "enqueue job" do
       Sidekiq.redis do |conn|
         assert_equal 0, conn.llen("queue:default"), "Queue should have no jobs"
@@ -106,5 +127,11 @@ describe 'Cron web' do
       post "/cron/#{@cron_job_name}/delete"
       assert_equal Sidekiq::Cron::Job.all.size, 0, "Should have zero jobs"
     end
+
+    it "destroy all jobs" do
+      assert_equal Sidekiq::Cron::Job.all.size, 2, "Should have 2 job"
+      post "/cron/__all__/delete"
+      assert_equal Sidekiq::Cron::Job.all.size, 0, "Should have zero jobs"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -39,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.3.0
 - !ruby/object:Gem::Dependency
-  name: redis-namespace
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
@@ -281,6 +281,7 @@ files:
 - lib/sidekiq/cron/web.rb
 - lib/sidekiq/cron/web_extension.rb
 - sidekiq-cron.gemspec
+- test/integration/performance_test.rb
 - test/test_helper.rb
 - test/unit/job_test.rb
 - test/unit/poller_test.rb