rails-pg-adapter 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b13533de6e67440feaaee7799c583984672793b16b10aee60ca89091cadef545
-  data.tar.gz: e6927d01f1604871d426d8fa894dc400ac3626191c151b034b12771ee68b91ac
+  metadata.gz: 75fd0eeee68afb5b74ee0b5ab2b5ebcc931265c4633918c7b4677e58b2678a85
+  data.tar.gz: fd33f8cbef14a5817662ba9adceabc35245995515f7d8d22a0a92127a58cee91
 SHA512:
-  metadata.gz: d60b542abec512d9f5d1567f65d4327e3bc299d8ac740616fbec5aeb394f612698db6c74f5a462640cd96bdb1fb7013ff433f28780ef5cb5c3c0157ca0fa10b4
-  data.tar.gz: 16bbac80afd152b275c451243331318be772c88b9dcce2ddb1eb30be5875556f489b476b55e3b34ec618e6047a00405ca6d9caa73729d83d480101c1849a0ec8
+  metadata.gz: 3c653f6457e09eb06f25abd20bdb756805e9dfacad132a036965ebce2f244a5f59b0d99599103f121f6df0d26455283719576eff224906a2c636dcb805c058b3
+  data.tar.gz: 65dc3285ad45a51fbb77022f3b892f5cf00281e188561c16d58180c99e8f6b2c80bc66fe7b7ef6b663a0c6f25197dd20bd88b4414ef35a9862dcc7bd118a67c8

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.1.9] - 2023-05-04
+
+- Retry on too many connections error as well
+
+## [0.1.8] - 2023-04-28
+
+- Make retry on ActiveRecord::NoDatabaseError stricter
+
 ## [0.1.7] - 2023-04-21
 
 - Simplify connection management and introduce upper bound to retries

data/lib/rails_pg_adapter/patch.rb

@@ -14,22 +14,40 @@ module RailsPgAdapter
       "connection is closed",
       "could not connect",
       "is not currently accepting connections",
+      "too many connections"
     ].freeze
     CONNECTION_ERROR_RE = /#{CONNECTION_ERROR.map { |w| Regexp.escape(w) }.join("|")}/.freeze
 
     CONNECTION_SCHEMA_ERROR = ["PG::UndefinedColumn"].freeze
     CONNECTION_SCHEMA_RE = /#{CONNECTION_SCHEMA_ERROR.map { |w| Regexp.escape(w) }.join("|")}/.freeze
 
+    class << self
+      def supported_errors?(e)
+        return true if failover_error?(e.message)
+        return true if missing_column_error?(e.message)
+        false
+      end
+
+      def failover_error?(error_message)
+        CONNECTION_ERROR_RE.match?(error_message) && ::RailsPgAdapter.failover_patch?
+      end
+
+      def missing_column_error?(error_message)
+        CONNECTION_SCHEMA_RE.match?(error_message) &&
+          ::RailsPgAdapter.reset_column_information_patch?
+      end
+    end
+
     private
 
     def exec_cache(*args)
-      sleep_times = RailsPgAdapter.configuration.reconnect_with_backoff.dup
+      sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
       begin
         super(*args)
       rescue ::ActiveRecord::StatementInvalid,
              ::ActiveRecord::ConnectionNotEstablished,
              ::ActiveRecord::NoDatabaseError => e
-        raise unless supported_errors?(e)
+        raise unless ::RailsPgAdapter::Patch.supported_errors?(e)
 
         if try_reconnect?(e)
           sleep_time = sleep_times.shift
@@ -44,13 +62,13 @@ module RailsPgAdapter
     end
 
     def exec_no_cache(*args)
-      sleep_times = RailsPgAdapter.configuration.reconnect_with_backoff.dup
+      sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
       begin
         super(*args)
       rescue ::ActiveRecord::StatementInvalid,
              ::ActiveRecord::ConnectionNotEstablished,
              ::ActiveRecord::NoDatabaseError => e
-        raise unless supported_errors?(e)
+        raise unless ::RailsPgAdapter::Patch.supported_errors?(e)
 
         if try_reconnect?(e)
           sleep_time = sleep_times.shift
@@ -66,8 +84,8 @@ module RailsPgAdapter
 
     def try_reconnect?(e)
       return false if in_transaction?
-      return false unless failover_error?(e.message)
-      return false unless RailsPgAdapter.reconnect_with_backoff?
+      return false unless ::RailsPgAdapter::Patch.failover_error?(e.message)
+      return false unless ::RailsPgAdapter.reconnect_with_backoff?
 
       begin
         disconnect_conn!
@@ -78,15 +96,13 @@ module RailsPgAdapter
     end
 
     def handle_error(e)
-      if failover_error?(e.message) && RailsPgAdapter.failover_patch?
+      if ::RailsPgAdapter::Patch.failover_error?(e.message)
         warn("clearing connections due to #{e} - #{e.message}")
         disconnect_conn!
         raise(e)
       end
 
-      unless missing_column_error?(e.message) && RailsPgAdapter.reset_column_information_patch?
-        return
-      end
+      return unless ::RailsPgAdapter::Patch.missing_column_error?(e.message)
 
       warn("clearing column information due to #{e} - #{e.message}")
 
@@ -94,14 +110,6 @@ module RailsPgAdapter
       raise
     end
 
-    def failover_error?(error_message)
-      CONNECTION_ERROR_RE.match?(error_message)
-    end
-
-    def missing_column_error?(error_message)
-      CONNECTION_SCHEMA_RE.match?(error_message)
-    end
-
     def disconnect_conn!
       disconnect!
       ::ActiveRecord::Base.connection_pool.remove(::ActiveRecord::Base.connection)
@@ -115,15 +123,7 @@ module RailsPgAdapter
     def warn(msg)
       return unless defined?(Rails)
       return if Rails.logger.nil?
-      ::Rails.logger.warn("[RailsPgAdapter::Patch] #{msg}")
-    end
-
-    def supported_errors?(e)
-      return true if failover_error?(e.message) && RailsPgAdapter.failover_patch?
-      if missing_column_error?(e.message) && RailsPgAdapter.reset_column_information_patch?
-        return true
-      end
-      false
+      ::Rails.logger.warn("[::RailsPgAdapter::Patch] #{msg}")
     end
   end
 end
@@ -138,15 +138,20 @@ module ActiveRecord
         old_new_client_method = instance_method(:new_client)
 
         define_method(:new_client) do |args|
-          sleep_times = RailsPgAdapter.configuration.reconnect_with_backoff.dup
+          sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
           begin
             old_new_client_method.bind(self).call(args)
           rescue ::ActiveRecord::ConnectionNotEstablished, ::ActiveRecord::NoDatabaseError => e
-            raise(e) unless RailsPgAdapter.failover_patch? && RailsPgAdapter.reconnect_with_backoff?
+            unless ::RailsPgAdapter::Patch.supported_errors?(e) &&
+                     ::RailsPgAdapter.reconnect_with_backoff?
+              raise
+            end
 
             sleep_time = sleep_times.shift
             raise unless sleep_time
-            warn("Could not establish a connection from new_client, retrying again in #{sleep_time} sec.")
+            warn(
+              "Could not establish a connection from new_client, retrying again in #{sleep_time} sec.",
+            )
             sleep(sleep_time)
             retry
           end

data/lib/rails_pg_adapter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsPgAdapter
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-pg-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Tines Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails