sidetiq 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ca85781f7ef90ef2a9f22d291cbbc934e58e13c
-  data.tar.gz: 6f661d24f2c6804b93df589e37bf6024a1077fda
+  metadata.gz: b04b7cc75ee4bfc199cd0d844008ddbe233488f5
+  data.tar.gz: be839f3d4817872e6d968c49838e738ef096d0b5
 SHA512:
-  metadata.gz: f3bdf15f517040645ac3c3e28c5feef804dcf6aae0a577550345036dd87daf9e771925a498c0bb545b94ea1136e349ec81a1e6021228e135d2153e7c378857fd
-  data.tar.gz: fc4e0d15560841bce7bec4b4ecfef8350c6ec24a2eee9bfa6e50ae8b3d3f93f7e57e28a25e560631a627bc6a2b6cac9bcbc9992826970295e36f7084d137c23f
+  metadata.gz: 6cbcf675522a069a327442266facd020fd24a62798ca3466827ba340d6a78a90f04b01cb029732248d9d33933677847cb3f19949dbdbc00760b1a82c629925d7
+  data.tar.gz: 5a3118fac8bbc228f6e3ba656344a746c12b622f7204c0de6948ffd67ace5f61992a7b86672e2ba0ccdd65e28422660222dda8101e5b95df95d12bd63fdb097a

data/.travis.yml

@@ -6,7 +6,6 @@ branches:
 services:
   - redis-server
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.1
   - jruby-19mode

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.6.2
+-----
+
+- Lock ice cube to 0.11.1 to fix memory leaks [camjackson]
+- Don't use Redis keys command [Connorhd ]
+- Use Sidekiq.redis_pool in Schedulable [nkondratyev]
+
 0.6.1
 -----
 

data/lib/sidetiq/schedulable.rb

@@ -45,7 +45,7 @@ module Sidetiq
         old_description = get_schedulable_key("schedule_description")
         if old_description != schedule.to_s
           get_schedulable_keys.map do |key|
-            schedulable_redis.del(key)
+            Sidekiq.redis_pool.with { |r| r.del(key) }
           end
           set_schedulable_key("schedule_description", schedule.to_s)
         end
@@ -53,20 +53,16 @@ module Sidetiq
 
       private
 
-      def schedulable_redis
-        Sidekiq.redis { |redis| redis }
-      end
-
       def get_schedulable_keys
-        schedulable_redis.keys("sidetiq:#{name}:*")
+        %w(next last schedule_description history).map { |key| "sidetiq:#{name}:#{key}" }
       end
 
       def get_schedulable_key(key)
-        schedulable_redis.get("sidetiq:#{name}:#{key}")
+        Sidekiq.redis_pool.with { |r| r.get("sidetiq:#{name}:#{key}") }
       end
 
       def set_schedulable_key(key, value)
-        schedulable_redis.set("sidetiq:#{name}:#{key}", value)
+        Sidekiq.redis_pool.with { |r| r.set("sidetiq:#{name}:#{key}", value) }
       end
 
       def get_timestamp(key)
@@ -83,4 +79,3 @@ module Sidetiq
     end
   end
 end
-

data/lib/sidetiq/version.rb

@@ -8,7 +8,7 @@ module Sidetiq
     MINOR = 6
 
     # Public: Sidetiq patch level.
-    PATCH = 1
+    PATCH = 2
 
     # Public: Sidetiq version suffix.
     SUFFIX = nil

data/lib/sidetiq/views/locks.erb

@@ -13,6 +13,7 @@
     <%= erb File.read(File.join(view_path, '_home_nav.erb')) %>
 
     <div class="col-md-9">
+      <% if @locks_available %>
       <% if @locks.length > 0 %>
       <table class="table table-striped table-bordered table-white table-sidetiq">
         <thead>
@@ -44,7 +45,9 @@
       <% else %>
       <div class="alert alert-success">No locks set.</div>
       <% end %>
-    </div>
+      <% else %>
+      <div class="alert alert-danger">KEYS command is disabled in your redis instance, lock information is not available.</div>
+      <% end %>
   </div>
 </div>
 

data/lib/sidetiq/web.rb

@@ -13,7 +13,12 @@ module Sidetiq
       end
 
       app.get "/sidetiq/locks" do
-        @locks = Sidetiq::Lock::Redis.all.map(&:meta_data)
+        begin
+          @locks = Sidetiq::Lock::Redis.all.map(&:meta_data)
+          @locks_available = true
+        rescue Redis::CommandError
+          @locks_available = false
+        end
 
         erb File.read(File.join(VIEWS, 'locks.erb')), locals: {view_path: VIEWS}
       end

data/sidetiq.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.extensions    = []
 
-  gem.add_dependency 'sidekiq',   '>= 2.16.0'
+  gem.add_dependency 'sidekiq',   '>= 3.0.0'
   gem.add_dependency 'celluloid', '>= 0.14.1'
-  gem.add_dependency 'ice_cube',  '~> 0.12.0'
+  gem.add_dependency 'ice_cube',  '0.11.1'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'sinatra'

data/test/helper.rb

@@ -13,6 +13,12 @@ require 'rack/test'
 require 'sidetiq'
 require 'sidetiq/web'
 
+module Sidekiq
+  def self.server?
+    true
+  end
+end
+
 class Sidetiq::Supervisor
   def self.clock
     @clock ||= Sidetiq::Clock.new

data/test/test_schedulable.rb

@@ -1,10 +1,25 @@
 require_relative 'helper'
+require 'minitest/mock'
 
 class TestShedulable < Sidetiq::TestCase
   class FakeWorker
     include Sidetiq::Schedulable
   end
 
+  def test_recurrence
+    Sidekiq.stub(:server?, true) do
+      Sidekiq.expects(:redis_pool).returns(Sidekiq::RedisConnection.create).at_least(1)
+
+      FakeWorker.recurrence { hourly }
+    end
+
+    Sidekiq.stub(:server?, false) do
+      Sidekiq.expects(:redis_pool).times(0)
+
+      FakeWorker.recurrence { hourly }
+    end
+  end
+
   def test_resheduling
     last_run = (Time.now - 100).to_f
     next_run = (Time.now + 100).to_f

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidetiq
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Tobias Svensson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement