sqeduler 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 285c8e84ead9c7c09c993c9dd758dde10dd1e9f1
-  data.tar.gz: 3fa620e267de5111437ed61a7993ea9e6ce9f248
+  metadata.gz: 18fa6822b0e491d4c9b06051fefc1658c8a90073
+  data.tar.gz: d25bf091049ddb0190d607eb7d72e19b8bff6a98
 SHA512:
-  metadata.gz: 18bed5ddc6ea2b8f34a5dd5817c49c9841912307a0dfe4e864dfae796e561a4e5e571132a20f4344ac8c049164795aa601b76dfe81232486c6801137d5a65825
-  data.tar.gz: 1fcfd239f05867d25212d83ba47c0fb28794d28799ffed3b7c4dafecca225af13c48373f321ad536424b1f73b45d69ed2609764bf9020b8f438ec5385c7e0558
+  metadata.gz: 77f216253e1b98d9a27a1af2a4d364a8d8a69bf4e5f6a59911ebac5c8589a24f22e80a85f99a3ed3459427ffebcc258b4d983d764b614ba5e1fb3b32b3e1679b
+  data.tar.gz: a514c7e379d85750fcec035daf74dab2fc32a23d0829502d09952a423cb0725264804737ff4e6c3d3a917112f0215983b4b210b7630db34310d7c375df32a8b8

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 0.3.4 / 2016-03-28
+
+* Add ability to use a client-provided connection pool rather than creating one
+
 ### 0.3.3 / 2016-03-25
 
 * Fixed lock refresher not calling `redis_pool` properly so it wouldn't actually run
@@ -5,7 +9,7 @@
 ### 0.3.2 / 2016-03-10
 
 * Fixed lock refresher failing to lock properly for exclusive runs
-* Added debug logs for lock refresher 
+* Added debug logs for lock refresher
 
 ### 0.3.1 / 2016-02-17
 

data/README.md

@@ -55,6 +55,8 @@ Sqeduler::Service.config = config
 Sqeduler::Service.start
 ```
 
+You can also pass in your own `ConnectionPool` instance as `config.redis_pool` rather than providing configuration in `redis_hash`. If you do so, it's recommended to use a `Redis::Namespace` so that the keys sqeduler sets are namespaced uniquely.
+
 See documentation for [Sidekiq::Scheduler](https://github.com/Moove-it/sidekiq-scheduler#scheduled-jobs-recurring-jobs)
 for specifics on how to construct your schedule YAML file.
 

data/lib/sqeduler/config.rb

@@ -2,11 +2,12 @@
 module Sqeduler
   # Simple config for Sqeduler::Service
   class Config
-    attr_accessor :logger, :redis_hash, :schedule_path,
+    attr_accessor :logger, :redis_hash, :redis_pool, :schedule_path,
                   :on_server_start, :on_client_start, :maintain_locks
 
     def initialize(opts = {})
       self.redis_hash = opts[:redis_hash]
+      self.redis_pool = opts[:redis_pool]
       self.schedule_path = opts[:schedule_path]
       self.on_server_start = opts[:on_server_start]
       self.on_client_start = opts[:on_client_start]

data/lib/sqeduler/service.rb

@@ -95,12 +95,18 @@ module Sqeduler
       # separate from Sidekiq's so that we don't saturate the client and server connection
       # pools.
       def redis_pool
-        @redis_pool ||= begin
+        @redis_pool ||= config_redis_pool
+      end
+
+      def config_redis_pool
+        redis_pool = if config.redis_pool
+          config.redis_pool
+        else
           redis = { :namespace => "sqeduler" }.merge(config.redis_hash)
-          ::Sidekiq::RedisConnection.create(redis).tap do |redis_pool|
-            verify_redis_pool(redis_pool)
-          end
+          ::Sidekiq::RedisConnection.create(redis)
         end
+        verify_redis_pool(redis_pool)
+        redis_pool
       end
 
       def logger

data/lib/sqeduler/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Sqeduler
-  VERSION = "0.3.3".freeze
+  VERSION = "0.3.4".freeze
 end

data/spec/service_spec.rb

@@ -6,6 +6,12 @@ RSpec.describe Sqeduler::Service do
     Logger.new(STDOUT).tap { |l| l.level = Logger::DEBUG }
   end
 
+  before do
+    described_class.instance_variables.each do |ivar|
+      described_class.remove_instance_variable(ivar)
+    end
+  end
+
   describe ".start" do
     subject { described_class.start }
 
@@ -106,6 +112,32 @@ RSpec.describe Sqeduler::Service do
       end
     end
 
+    context "with pool provided in config" do
+      let(:original_pool) do
+        ConnectionPool.new(:size => 10, :timeout => 0.1) do
+          Redis::Namespace.new("sqeduler", :client => Redis.new(REDIS_CONFIG))
+        end
+      end
+
+      before do
+        described_class.config = Sqeduler::Config.new.tap do |config|
+          config.redis_pool = original_pool
+          config.logger = logger
+        end
+      end
+
+      it "doesn't create a connection pool" do
+        expect(subject.object_id).to eq(original_pool.object_id)
+      end
+
+      it "checks redis version" do
+        allow_any_instance_of(Redis).to receive(:info).and_return(
+          "redis_version" => "2.6.11"
+        )
+        expect { subject }.to raise_error
+      end
+    end
+
     it "creates a connection pool" do
       expect(subject).to be_kind_of(ConnectionPool)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqeduler
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Jared Jenkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq