rails-pg-adapter 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75fd0eeee68afb5b74ee0b5ab2b5ebcc931265c4633918c7b4677e58b2678a85
-  data.tar.gz: fd33f8cbef14a5817662ba9adceabc35245995515f7d8d22a0a92127a58cee91
+  metadata.gz: 97170715fde6ba059d296a9fbce17b22b1c0e4a40d48473992d02d8368b96963
+  data.tar.gz: 51099b75bbaaa27a0f8120a865da60da33a21e35b262802843ba29791c8d572f
 SHA512:
-  metadata.gz: 3c653f6457e09eb06f25abd20bdb756805e9dfacad132a036965ebce2f244a5f59b0d99599103f121f6df0d26455283719576eff224906a2c636dcb805c058b3
-  data.tar.gz: 65dc3285ad45a51fbb77022f3b892f5cf00281e188561c16d58180c99e8f6b2c80bc66fe7b7ef6b663a0c6f25197dd20bd88b4414ef35a9862dcc7bd118a67c8
+  metadata.gz: 1458a06466189759dee8b82cea49adbf856cac36937ead93975d47439d4f962033a5a4c01f9bcce871c919a0c7c4341f7b07c62c7c5f882cd98ffde70b685e06
+  data.tar.gz: 563aef7c452bfd98266543597ed5cb2502d2047fe0cd586522bc431aa441b86b799c494a5f4c69f03047a52fba2a5b916dac553160f07976e6b05445e431454c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.1.11] - 2023-05-08
+
+- Attempt a re-connect before a retry
+
+## [0.1.10] - 2023-05-04
+
+- Handle Connection refused
+
 ## [0.1.9] - 2023-05-04
 
 - Retry on too many connections error as well

data/lib/rails_pg_adapter/patch.rb

@@ -14,7 +14,8 @@ module RailsPgAdapter
       "connection is closed",
       "could not connect",
       "is not currently accepting connections",
-      "too many connections"
+      "too many connections",
+      "Connection refused",
     ].freeze
     CONNECTION_ERROR_RE = /#{CONNECTION_ERROR.map { |w| Regexp.escape(w) }.join("|")}/.freeze
 
@@ -42,6 +43,7 @@ module RailsPgAdapter
 
     def exec_cache(*args)
       sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
+      query, _ = args
       begin
         super(*args)
       rescue ::ActiveRecord::StatementInvalid,
@@ -49,20 +51,19 @@ module RailsPgAdapter
              ::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
+        handle_error(e) unless try_reconnect?(e)
+        sleep_time = sleep_times.shift
+        handle_error(e) unless sleep_time
+        warn("Retry query failed, retrying again in #{sleep_time} sec. Retrying: #{query}")
+        sleep(sleep_time)
+        connect
+        retry
       end
     end
 
     def exec_no_cache(*args)
       sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
+      query, _ = args
       begin
         super(*args)
       rescue ::ActiveRecord::StatementInvalid,
@@ -70,15 +71,13 @@ module RailsPgAdapter
              ::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
+        handle_error(e) unless try_reconnect?(e)
+        sleep_time = sleep_times.shift
+        handle_error(e) unless sleep_time
+        warn("Retry query failed, retrying again in #{sleep_time} sec. Retrying: #{query}")
+        sleep(sleep_time)
+        connect
+        retry
       end
     end
 
@@ -99,15 +98,13 @@ module RailsPgAdapter
       if ::RailsPgAdapter::Patch.failover_error?(e.message)
         warn("clearing connections due to #{e} - #{e.message}")
         disconnect_conn!
-        raise(e)
       end
 
-      return unless ::RailsPgAdapter::Patch.missing_column_error?(e.message)
-
+      raise(e) unless ::RailsPgAdapter::Patch.missing_column_error?(e.message)
       warn("clearing column information due to #{e} - #{e.message}")
 
       internal_clear_schema_cache!
-      raise
+      raise(e)
     end
 
     def disconnect_conn!

data/lib/rails_pg_adapter/version.rb

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

metadata

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