maria_db_cluster_pool 0.0.9 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f160b96f54605a291e71690da6b671debc122d9b
+  data.tar.gz: 37ea09c465363675fb3e9f9c0de0e5347018996e
+SHA512:
+  metadata.gz: d65356f3e7702e384ddd20f058814f752a3edc188bd0f604e3ecde1910803879984eae4771242152007f5497a005653ecbedeed1575c965b71f6b7014b883a29
+  data.tar.gz: 47c2390ad12fe7982fc7a7c6c8723aa1fd8e623e055a3b47f38040696e3b32dd9a99b7de378f01ab8a67261ed79949144411d83c861349de758f97f73a3c0923

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'rake'
 require 'yaml'
+require "bundler/gem_tasks"
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -10,7 +11,7 @@ begin
   require 'rspec/core/rake_task'
   desc 'Run the unit tests'
   RSpec::Core::RakeTask.new(:test)
-  
+
   namespace :test do
     desc "Run all tests including for all database adapters"
     task :all do
@@ -58,4 +59,4 @@ rescue LoadError
   task :test do
     STDERR.puts "You must have rspec >= 2.0 to run the tests"
   end
-end
+end

data/lib/active_record/connection_adapters/maria_db_cluster_pool_adapter.rb

@@ -16,8 +16,9 @@ module ActiveRecord
           begin
             establish_adapter(server_config[:adapter])
             conn = send("#{server_config[:adapter]}_connection".to_sym, server_config)
-            conn.class.send(:include, MariaDbClusterPool::ConnectTimeout) unless conn.class.include?(MariaDbClusterPool::ConnectTimeout)
-            conn.connect_timeout = server_config[:connect_timeout]
+            # conn.class.send(:include, MariaDbClusterPool::ConnectTimeout) unless conn.class.include?(MariaDbClusterPool::ConnectTimeout)
+            # conn.connect_timeout = server_config[:connect_timeout]
+
             pool_connections << conn
             pool_weights[conn] = server_config[:pool_weight]
           rescue Exception => e
@@ -30,7 +31,7 @@ module ActiveRecord
 
         @maria_db_cluster_pool_classes ||= {}
         klass = @maria_db_cluster_pool_classes[pool_connections[0].class]
-        unless klass
+        unless klass.present?
           klass = ActiveRecord::ConnectionAdapters::MariaDbClusterPoolAdapter.adapter_class(pool_connections[0])
           @maria_db_cluster_pool_classes[pool_connections[0].class] = klass
         end
@@ -46,10 +47,10 @@ module ActiveRecord
           require 'rubygems'
           gem "activerecord-#{adapter}-adapter"
           require "active_record/connection_adapters/#{adapter}_adapter"
-        rescue LoadError
+        rescue LoadError => e
           begin
             require "active_record/connection_adapters/#{adapter}_adapter"
-          rescue LoadError
+          rescue LoadError => ee
             raise "Please install the #{adapter} adapter: `gem install activerecord-#{adapter}-adapter` (#{$!})"
           end
         end
@@ -60,6 +61,8 @@ module ActiveRecord
         end
       end
     end
+
+    # include(MariaDbClusterPoolAdapter) unless include?(MariaDbClusterPoolAdapter)
   end
 
   module ConnectionAdapters
@@ -112,11 +115,12 @@ module ActiveRecord
       end
       
       def initialize(connection, logger, connections, pool_weights)
-        super(connection, logger)
-
+        # @available_connections = connections.dup.freeze
+        @connections = connections.dup.freeze
         @available_connections = []
         @master_connection = connection
-        @connections = connections.dup.freeze
+
+        super(connection, logger)
 
         pool_weights.each_pair do |conn, weight|
           @available_connections[weight] = AvailableConnection.new(conn)
@@ -174,7 +178,7 @@ module ActiveRecord
 
       class DatabaseConnectionError < StandardError
       end
-      
+
       # This simple class puts an expire time on an array of connections. It is used so the a connection
       # to a down database won't try to reconnect over and over.
       class AvailableConnection
@@ -227,7 +231,30 @@ module ActiveRecord
         end
 
         @available_connections
-
+        # available = @available_connections.last
+        # if available.expired?
+        #   begin
+        #     @logger.info("Adding dead database connection back to the pool") if @logger
+        #     available.reconnect!
+        #   rescue => e
+        #     # Couldn't reconnect so try again in a little bit
+        #     if @logger
+        #       @logger.warn("Failed to reconnect to database when adding connection back to the pool")
+        #       @logger.warn(e)
+        #     end
+        #     available.expires = 30.seconds.from_now
+        #     return available.connections
+        #   end
+        #
+        #   # If reconnect is successful, the connection will have been re-added to @available_read_connections list,
+        #   # so let's pop this old version of the connection
+        #   @available_connections.pop
+        #
+        #   # Now we'll try again after either expiring our bad connection or re-adding our good one
+        #   return available_connections
+        # else
+        #   return available.connections
+        # end
       end
       
       def reset_available_connections

metadata

@@ -1,79 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: maria_db_cluster_pool
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
+version: !ruby/object:Gem::Version
+  version: 0.1.0
 platform: ruby
-authors: 
-- "Ren\xC3\xA9 Schultz Madsen"
+authors:
+- René Schultz Madsen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-11-19 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-06-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 3
-        - 11
-        version: 2.3.11
+      - !ruby/object:Gem::Version
+        version: 3.0.20
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 3.0.20
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  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: pg
+  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: This gem add support for the Maria DB Galera Cluster setup.
 email: rm@microting.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - MIT-LICENSE
 - README.md
-files: 
+files:
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -81,39 +95,29 @@ files:
 - lib/maria_db_cluster_pool.rb
 - lib/maria_db_cluster_pool/arel_compiler.rb
 - lib/maria_db_cluster_pool/connect_timeout.rb
-has_rdoc: true
 homepage: https://github.com/renemadsen/maria_db_cluster_pool
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: Add support for master/master database clusters in ActiveRecord to improve performance.
+specification_version: 4
+summary: Add support for master/master database clusters in ActiveRecord to improve
+  performance.
 test_files: []
-