sequel-replica-failover 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dba94be5402e5660e5ae3308c9e8e4463195b34
-  data.tar.gz: ac4906af1bde935311bb7c492a24f583f9070092
+  metadata.gz: 31cc90d47b9bbe08b846ea3af88bb29a647fe6d3
+  data.tar.gz: 21ccb990de1601f8f49c4523343a92587abdfc62
 SHA512:
-  metadata.gz: b6d2891b1a22ebbff6f74ced00643ed77648ad9c346f87414ba3e5663e23399a62200338380372f3c605e8120be933e818d7768a074d036b64503fe5a3ecf2bf
-  data.tar.gz: 8782591c54e37e2b1068886bd801b3e8883df2a3d872cfee35aafca4ef5d2e8d81ea12e344dab3f4a4f53c7a1cb6c6af69cc0e9d1e4c6d31c571ce78a0d9841f
+  metadata.gz: 0bf16b9998f95ac996b20731c872b481c11482d8d00f145d0a19eed7ad5341f8e01e15417615d210a2b73d6f98ff106f57a3e3f34e33550555c837dd95b0a88b
+  data.tar.gz: ddcb1cbb66e57295b5530f8e6a3378152b1b9aaaadf0ad8da7f47169bb39988a62f8f5e9f8956454f485487b391e8442be7ebcbd625db264eb79cd75d88ad8e2

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0-p247
+script: "bundle exec rspec"
+notifications:
+  email: false

data/Gemfile

@@ -3,5 +3,3 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in sequel-replica-failover.gemspec
 gemspec
 
-# for testing purposes until pull request is accepted
-gem 'ruby-usdt', github: 'sax/ruby-usdt', ref: 'probe-introspection', submodules: true

data/README.md

@@ -1,5 +1,8 @@
 # Automatic read-only failover for Sequel
 
+[![Gem Version](https://badge.fury.io/rb/sequel-replica-failover.png)](http://badge.fury.io/rb/sequel-replica-failover)
+[![Code Climate](https://codeclimate.com/github/wanelo/sequel-replica-failover.png)](https://codeclimate.com/github/wanelo/sequel-replica-failover)
+
 This provides a NOT-THREADSAFE sharded connection pool for failing over between configured replicas.
 
 The mechanisms it provides are as follows:

data/lib/sequel-replica-failover/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   module ReplicaFailover
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/lib/sequel/connection_pool/sharded_single_failover.rb

@@ -8,6 +8,10 @@ class Sequel::ShardedSingleFailoverConnectionPool < Sequel::ShardedSingleConnect
     @pool_retry_count   = opts[:pool_retry_count]   || 5
   end
 
+  class << self
+    attr_accessor :on_disconnect
+  end
+
   # Yields the connection to the supplied block for the given server.
   # This method simulates the ConnectionPool#hold API.
   def hold(server=:default, &block)
@@ -18,14 +22,16 @@ class Sequel::ShardedSingleFailoverConnectionPool < Sequel::ShardedSingleConnect
     end
 
     super(server, &block)
-  rescue Sequel::DatabaseDisconnectError, Sequel::DatabaseConnectionError
+  rescue Sequel::DatabaseDisconnectError, Sequel::DatabaseConnectionError => e
     if server == :read_only && !@db.in_transaction?(server: :read_only)
+      self.class.on_disconnect.call(e, self) if self.class.on_disconnect
       disconnect_server(server)
       @conns[server] = nil
 
       stick
 
       if @stuck_times >= @pool_retry_count
+        unstick(server)
         raise
       end
 

data/sequel-replica-failover.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["paul@wanelo.com"]
   spec.description   = %q{Automatically failover between replicas when they go down.}
   spec.summary       = %q{Automatically failover when replicas go down.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/wanelo/sequel-replica-failover"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "sequel", ">= 4.3.0"
-  spec.add_dependency "ruby-usdt"
+  spec.add_dependency "ruby-usdt", ">= 0.2.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/sequel/connection_pool/sharded_single_failover_spec.rb

@@ -49,6 +49,17 @@ describe Sequel::ShardedSingleFailoverConnectionPool do
           @connection_pool.hold(:read_only) {}
         end
 
+        context 'with an on_disconnect callback' do
+          it 'calls the callback with the error' do
+            callback = double("callback")
+            Sequel::ShardedSingleFailoverConnectionPool.on_disconnect = callback
+
+            expect(callback).to receive(:call).with(an_instance_of(Sequel::DatabaseDisconnectError), @connection_pool)
+            call_count = 0
+            @connection_pool.hold(:read_only) { call_count += 1; raise Sequel::DatabaseDisconnectError if call_count == 1 }
+          end
+        end
+
         context 'when in a transaction' do
           it 'raises an exception' do
             Sequel::Mock::Database.any_instance.should_receive(:in_transaction?).and_return(true)
@@ -66,4 +77,12 @@ describe Sequel::ShardedSingleFailoverConnectionPool do
       end
     end
   end
+
+  describe '.on_disconnect' do
+    it 'sets the on_disconnect attribute' do
+      callback = Proc.new{ puts "woo" }
+      Sequel::ShardedSingleFailoverConnectionPool.on_disconnect = callback
+      expect(Sequel::ShardedSingleFailoverConnectionPool.on_disconnect).to eq(callback)
+    end
+  end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: sequel-replica-failover
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Paul Henry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: ruby-usdt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Automatically failover between replicas when they go down.
@@ -115,8 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -130,7 +131,7 @@ files:
 - spec/sequel-replica-failover/dtrace_provider_spec.rb
 - spec/sequel/connection_pool/sharded_single_failover_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/wanelo/sequel-replica-failover
 licenses:
 - MIT
 metadata: {}
@@ -140,17 +141,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Automatically failover when replicas go down.
@@ -158,3 +159,4 @@ test_files:
 - spec/sequel-replica-failover/dtrace_provider_spec.rb
 - spec/sequel/connection_pool/sharded_single_failover_spec.rb
 - spec/spec_helper.rb
+has_rdoc: