pgtk 0.31.2 → 0.31.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7db2cc332dfccb4c405f590cc7aa64ffc55d1aa916aea3c0ea68379208c2568
-  data.tar.gz: c7a03b2c8b6ccf2b931b1ab4d16bf83f352edeb0099c1d5fcc8f21a5f274a789
+  metadata.gz: b3a43722aa806c7c496234f00c186abac8cf07dfeb48e9baa97353fca08a1e0a
+  data.tar.gz: 63e903b575092c0bb62bf25b5aa96004723f4c4312bf3e16c4b5fc2af0b2b0c7
 SHA512:
-  metadata.gz: d0e7ca8dc2192a5acb274b9e4b02fda11fdfaf471fe607c7d5d8ac0cf85cd8b527bb35f3de93f271102ba4b483a285452df5d6e1f308df8f503e987b42b10197
-  data.tar.gz: d028000b4d1e869d9766105a7706f8b415f012a1c6f3254f2c2bdd6bb8578b97f27fd22f317cc06f7609ca3b79667814d60ca1713b21be3145a51b1b41e5d752
+  metadata.gz: d03c3c8458643fc95801a51b6d2fd4a61808ff934f2ac4341ea02b779d8ef688f44283f079b69a8d8bd02dc1d2733c07af4549dfcf8b41e3acceb5402083223e
+  data.tar.gz: 842c436ab8180751b612b55a5a0f113b3db10a101c1db9dd3adf1150ac2b5961c3baa5654a7d8c4cc44ccb788c77e495c0523a235ef0e2275f6c4b12729a8fa6

data/lib/pgtk/pool.rb

@@ -219,9 +219,14 @@ class Pgtk::Pool
         r = yield(t)
         t.exec('COMMIT')
         r
-      rescue StandardError => e
-        t.exec('ROLLBACK')
-        raise(e)
+      ensure
+        if c.transaction_status != PG::Constants::PQTRANS_IDLE
+          begin
+            t.exec('ROLLBACK')
+          rescue StandardError => e
+            @log.warn("Failed to rollback transaction: #{e.message}")
+          end
+        end
       end
     end
   end
@@ -343,16 +348,29 @@ class Pgtk::Pool
 
   def connect
     conn = @pool.pop
+    conn = renew(conn) if dead?(conn)
     begin
       yield(conn)
     rescue StandardError => e
-      conn = renew(conn)
+      begin
+        conn = renew(conn)
+      rescue StandardError => re
+        @log.warn("Failed to renew connection after #{e.message}: #{re.message}")
+      end
       raise(e)
     ensure
       @pool.push(conn)
     end
   end
 
+  def dead?(conn)
+    conn.finished? ||
+      conn.status == PG::Constants::CONNECTION_BAD ||
+      conn.transaction_status != PG::Constants::PQTRANS_IDLE
+  rescue StandardError
+    true
+  end
+
   def renew(conn)
     begin
       conn.close unless conn.finished?

data/lib/pgtk/version.rb

@@ -10,5 +10,5 @@ require_relative '../pgtk'
 # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
 # License:: MIT
 module Pgtk
-  VERSION = '0.31.2' unless defined?(VERSION)
+  VERSION = '0.31.4' unless defined?(VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.31.2
+  version: 0.31.4
 platform: ruby
 authors:
 - Yegor Bugayenko