rails-pg-adapter 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 432740419d2edda4a33caf34ba5efa2af778456763db8864c632b3d813f1953e
-  data.tar.gz: 60a026760c20847ace00bf181878c0039eface04fa30ff51227e677be88f95c0
+  metadata.gz: b13533de6e67440feaaee7799c583984672793b16b10aee60ca89091cadef545
+  data.tar.gz: e6927d01f1604871d426d8fa894dc400ac3626191c151b034b12771ee68b91ac
 SHA512:
-  metadata.gz: 5fb1aac2ec7330a599cc9005d339fab13613b409cf37152a003826b760c02b8b4060b0134d50799be4db7d77e6db4165b6ef99d0b1df0399133749f4746c5a25
-  data.tar.gz: 0450d73b3e3330da51c01d64a922828da6b32fe1d500d2c719ee40bd5dbbc2ac2c40d87cc93bc3a8a53676c3476f61180684a6bf05cf301d876f393eab6b5bee
+  metadata.gz: d60b542abec512d9f5d1567f65d4327e3bc299d8ac740616fbec5aeb394f612698db6c74f5a462640cd96bdb1fb7013ff433f28780ef5cb5c3c0157ca0fa10b4
+  data.tar.gz: 16bbac80afd152b275c451243331318be772c88b9dcce2ddb1eb30be5875556f489b476b55e3b34ec618e6047a00405ca6d9caa73729d83d480101c1849a0ec8

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [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
+
 ## [0.1.5] - 2023-04-19
 
 - Retry queries when not in transaction

data/lib/rails_pg_adapter/patch.rb

@@ -13,6 +13,7 @@ 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
 
@@ -22,19 +23,45 @@ module RailsPgAdapter
     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 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 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)
@@ -43,7 +70,7 @@ module RailsPgAdapter
       return false unless RailsPgAdapter.reconnect_with_backoff?
 
       begin
-        reconnect!
+        disconnect_conn!
         true
       rescue ::ActiveRecord::ConnectionNotEstablished
         false
@@ -53,11 +80,13 @@ module RailsPgAdapter
     def handle_error(e)
       if failover_error?(e.message) && RailsPgAdapter.failover_patch?
         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?
+      unless missing_column_error?(e.message) && RailsPgAdapter.reset_column_information_patch?
+        return
+      end
 
       warn("clearing column information due to #{e} - #{e.message}")
 
@@ -73,7 +102,7 @@ module RailsPgAdapter
       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
@@ -112,12 +141,12 @@ module ActiveRecord
           sleep_times = RailsPgAdapter.configuration.reconnect_with_backoff.dup
           begin
             old_new_client_method.bind(self).call(args)
-          rescue ::ActiveRecord::ConnectionNotEstablished => e
+          rescue ::ActiveRecord::ConnectionNotEstablished, ::ActiveRecord::NoDatabaseError => e
             raise(e) unless RailsPgAdapter.failover_patch? && RailsPgAdapter.reconnect_with_backoff?
 
             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.5"
+  VERSION = "0.1.7"
 end

metadata

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