rails-pg-adapter 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8492318d406e356186bb5d0830087f1e3c21eeeefbc806b0881680a026c3e85b
-  data.tar.gz: 52d95814d9f0df186c464932e4a81f30ff6d2aabf8715740b64d4973877a7681
+  metadata.gz: 17e38c0c8aeb60de1697257595dd0123a262d7e6a10a996de13086e826da96a7
+  data.tar.gz: 2bb519b103a9027848ae3ca963efc66f57d47b2b34be969657035c7a4f35256b
 SHA512:
-  metadata.gz: f51318474f857c6733e86f7cb6a19d7d2e7d84cd4de5125b780e1a44a7ff8bdb6325e9dd934c197b47566bf6d359454e0fc0761563b64e5629d752fa2886f10c
-  data.tar.gz: 7a98ab05cc5d99a1b26244ea000634fd4efdb8d855a1c81c101342e6aa1149ecac01fd5c8131837ff3ae0ae9d75e1c98bdbed2974be7c38e9810643b22580d8b
+  metadata.gz: f65dba534475afa8db2028ec685822c86d2c80df01ef29b99212440d032b797c3a99cad2150d4276802df26fed34e45fd0810f9051f4e4ce57e4d657898aebd2
+  data.tar.gz: 80c9d7257edfefc0f452930cc84f864056df43b1cfea3c2705397411e297c6dce02fa4d43ae55bc0a188a49d778514caa9df6341e36154408a243376880040d1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.1.7] - 2023-04-21
+
+- Simplify connection management and introduce upper bound to retries
+
 ## [0.1.6] - 2023-04-19
 
 - Disconnect and remove connection when in read-only

data/lib/rails_pg_adapter/patch.rb

@@ -13,44 +13,81 @@ module RailsPgAdapter
       "the database system is starting up",
       "connection is closed",
       "could not connect",
+      "is not currently accepting 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
 
-    CONNECTION_READ_ONLY_ERROR = [
-      "read-only",
-      "PG::ReadOnlySqlTransaction",
-    ].freeze
-    CONNECTION_READ_ONLY_ERROR_RE = /#{CONNECTION_READ_ONLY_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)
-      super(*args)
-    rescue ::ActiveRecord::StatementInvalid, ::ActiveRecord::ConnectionNotEstablished => e
-      raise unless supported_errors?(e)
-
-      try_reconnect?(e) ? retry : handle_error(e)
+      sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
+      begin
+        super(*args)
+      rescue ::ActiveRecord::StatementInvalid,
+             ::ActiveRecord::ConnectionNotEstablished,
+             ::ActiveRecord::NoDatabaseError => e
+        raise unless ::RailsPgAdapter::Patch.supported_errors?(e)
+
+        if try_reconnect?(e)
+          sleep_time = sleep_times.shift
+          handle_error(e) unless sleep_time
+          warn("Retry query failed, retrying again in #{sleep_time} sec.")
+          sleep(sleep_time)
+          retry
+        else
+          handle_error(e)
+        end
+      end
     end
 
     def exec_no_cache(*args)
-      super(*args)
-    rescue ::ActiveRecord::StatementInvalid, ::ActiveRecord::ConnectionNotEstablished => e
-      raise unless supported_errors?(e)
-
-      try_reconnect?(e) ? retry : handle_error(e)
+      sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
+      begin
+        super(*args)
+      rescue ::ActiveRecord::StatementInvalid,
+             ::ActiveRecord::ConnectionNotEstablished,
+             ::ActiveRecord::NoDatabaseError => e
+        raise unless ::RailsPgAdapter::Patch.supported_errors?(e)
+
+        if try_reconnect?(e)
+          sleep_time = sleep_times.shift
+          handle_error(e) unless sleep_time
+          warn("Retry query failed, retrying again in #{sleep_time} sec.")
+          sleep(sleep_time)
+          retry
+        else
+          handle_error(e)
+        end
+      end
     end
 
     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_and_remove_conn! if read_only_error?(e.message)
-        reconnect!
+        disconnect_conn!
         true
       rescue ::ActiveRecord::ConnectionNotEstablished
         false
@@ -58,13 +95,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_and_remove_conn!
+        disconnect_conn!
         raise(e)
       end
 
-      return unless missing_column_error?(e.message) && RailsPgAdapter.reset_column_information_patch?
+      return unless ::RailsPgAdapter::Patch.missing_column_error?(e.message)
 
       warn("clearing column information due to #{e} - #{e.message}")
 
@@ -72,15 +109,7 @@ 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_and_remove_conn!
+    def disconnect_conn!
       disconnect!
       ::ActiveRecord::Base.connection_pool.remove(::ActiveRecord::Base.connection)
     end
@@ -93,19 +122,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
-    end
-
-    def read_only_error?(error_message)
-      CONNECTION_READ_ONLY_ERROR_RE.match?(error_message)
+      ::Rails.logger.warn("[::RailsPgAdapter::Patch] #{msg}")
     end
   end
 end
@@ -120,15 +137,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 => e
-            raise(e) unless RailsPgAdapter.failover_patch? && RailsPgAdapter.reconnect_with_backoff?
+          rescue ::ActiveRecord::ConnectionNotEstablished, ::ActiveRecord::NoDatabaseError => e
+            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.6"
+  VERSION = "0.1.8"
 end

metadata

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