pgtk 0.31.3 → 0.31.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce069bed0f29101349d2617ad2ae7c51f4f03e6b6a4b800d717bf4ac75bb533f
-  data.tar.gz: 81e34a18fdf26fea4545e33f5c554af8b17f74f75e0a8efe450dea16fa13df49
+  metadata.gz: 9986e9d0fb260d182d823661b28c2782b7cbc066348431c59f18a2541e53018f
+  data.tar.gz: 50c04ad428b737284568c3cc134c7b5f0cff4d8cdf9b1a02430213a31e819701
 SHA512:
-  metadata.gz: fea29eaaef7f045eec87fd114d5ba55782d50332333169ab30012bbf9e221dd2c3ef1be57af808f4aa1986b5356e27a8b25ce144c52bcaad3ad8329772eb81a2
-  data.tar.gz: c84f1647c650b98ff6e34e752184a922ec74c285c55dcfa26714c50280a09bb5cf6bf3ff6e40dee0c5f03a39aa0aa30396ad7ffd30b05859d981eb67c2697437
+  metadata.gz: 0f6bf39b221fcedfc9ffd9843ef1d6ca43834d695c9a980139f60dd4915c9582f3174c5047710ecad954f62e9fad42b0fac540b9efcf5946885b7cde7da6b747
+  data.tar.gz: 64bd40eaa16ad9ee3684adc204d442b3ec8a19fe699c0cfc8323b19c098fcbf61ed3bf225d961bbb02cf1f16ee69b976035aaa5dd3661873ab4c3fbf00defd57

data/lib/pgtk/pool.rb

@@ -4,6 +4,7 @@ require 'loog'
 # SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
+require 'ellipsized'
 require 'pg'
 require 'tago'
 require_relative '../pgtk'
@@ -84,46 +85,7 @@ class Pgtk::Pool
       "  Pgtk version: #{Pgtk::VERSION}",
       "  PgSQL version: #{version}",
       "  #{@pool.size} connections:",
-      @pool.map do |c|
-        [
-          '    ',
-          "##{c.backend_pid}",
-          case c.pipeline_status
-          when PG::Constants::PQ_PIPELINE_ON
-            'ON'
-          when PG::Constants::PQ_PIPELINE_OFF
-            'OFF'
-          when PG::Constants::PQ_PIPELINE_ABORTED
-            'ABORTED'
-          else
-            "pipeline_status=#{c.pipeline_status}"
-          end,
-          case c.status
-          when PG::Constants::CONNECTION_OK
-            'OK'
-          when PG::Constants::CONNECTION_BAD
-            'BAD'
-          else
-            "status=#{c.status}"
-          end,
-          case c.transaction_status
-          when PG::Constants::PQTRANS_IDLE
-            'IDLE'
-          when PG::Constants::PQTRANS_ACTIVE
-            'ACTIVE'
-          when PG::Constants::PQTRANS_INTRANS
-            'INTRANS'
-          when PG::Constants::PQTRANS_INERROR
-            'INERROR'
-          when PG::Constants::PQTRANS_UNKNOWN
-            'UNKNOWN'
-          else
-            "transaction_status=#{c.transaction_status}"
-          end
-        ].join(' ')
-      rescue PG::ConnectionBad => e
-        e.message
-      end
+      @pool.map { |conn| info(conn) }
     ].flatten.join("\n")
   end
 
@@ -219,9 +181,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
@@ -306,6 +273,7 @@ class Pgtk::Pool
     def exec(query, args = [], result = 0)
       start = Time.now
       sql = query.is_a?(Array) ? query.join(' ') : query
+      @conn.instance_variable_set(:@pgtk_last_query, sql)
       begin
         out =
           if args.empty?
@@ -343,30 +311,76 @@ class Pgtk::Pool
 
   def connect
     conn = @pool.pop
-    conn = renew(conn) if dead?(conn)
     begin
-      yield(conn)
-    rescue StandardError => e
+      reason = cause(conn)
+      if reason
+        begin
+          conn = renew(conn, reason)
+        rescue StandardError => e
+          @log.warn("Failed to renew dead connection (#{reason}): #{e.message}")
+        end
+      end
       begin
-        conn = renew(conn)
-      rescue StandardError => re
-        @log.warn("Failed to renew connection after #{e.message}: #{re.message}")
+        yield(conn)
+      rescue StandardError => e
+        begin
+          conn = renew(conn, "query failed: #{e.message.strip}")
+        rescue StandardError => re
+          @log.warn("Failed to renew connection after #{e.message}: #{re.message}")
+        end
+        raise(e)
       end
-      raise(e)
     ensure
       @pool.push(conn)
     end
   end
 
-  def dead?(conn)
-    conn.finished? || conn.status == PG::Constants::CONNECTION_BAD
-  rescue StandardError
-    true
+  def cause(conn)
+    return 'finished' if conn.finished?
+    return 'status BAD' if conn.status == PG::Constants::CONNECTION_BAD
+    return "transaction status #{conn.transaction_status}" if conn.transaction_status != PG::Constants::PQTRANS_IDLE
+    nil
+  rescue StandardError => e
+    "inspection failed: #{e.message.strip}"
   end
 
-  def renew(conn)
+  def info(conn)
+    pipelines = { PG::Constants::PQ_PIPELINE_ON => 'ON', PG::Constants::PQ_PIPELINE_OFF => 'OFF',
+                  PG::Constants::PQ_PIPELINE_ABORTED => 'ABORTED' }
+    statuses = { PG::Constants::CONNECTION_OK => 'OK', PG::Constants::CONNECTION_BAD => 'BAD' }
+    transactions = { PG::Constants::PQTRANS_IDLE => 'IDLE', PG::Constants::PQTRANS_ACTIVE => 'ACTIVE',
+                     PG::Constants::PQTRANS_INTRANS => 'INTRANS', PG::Constants::PQTRANS_INERROR => 'INERROR',
+                     PG::Constants::PQTRANS_UNKNOWN => 'UNKNOWN' }
+    parts = [
+      '    ',
+      "##{conn.backend_pid}",
+      pipelines.fetch(conn.pipeline_status, "pipeline_status=#{conn.pipeline_status}"),
+      statuses.fetch(conn.status, "status=#{conn.status}"),
+      transactions.fetch(conn.transaction_status, "transaction_status=#{conn.transaction_status}")
+    ]
+    if conn.transaction_status == PG::Constants::PQTRANS_ACTIVE
+      running = conn.instance_variable_get(:@pgtk_last_query)
+      parts << "running: #{running.gsub(/\s+/, ' ').strip.ellipsized(60)}" if running
+    end
+    parts.join(' ')
+  rescue PG::ConnectionBad => e
+    parts = [e.message.strip]
+    closed = conn.instance_variable_get(:@pgtk_closed_at)
+    parts << "#{closed.ago} ago" if closed
+    reason = conn.instance_variable_get(:@pgtk_closed_reason)
+    parts << "because: #{reason}" if reason
+    last = conn.instance_variable_get(:@pgtk_last_query)
+    parts << "last query: #{last.gsub(/\s+/, ' ').strip.ellipsized(60)}" if last
+    parts.join(', ')
+  end
+
+  def renew(conn, reason)
     begin
-      conn.close unless conn.finished?
+      unless conn.finished?
+        conn.instance_variable_set(:@pgtk_closed_at, Time.now)
+        conn.instance_variable_set(:@pgtk_closed_reason, reason)
+        conn.close
+      end
     rescue StandardError => e
       @log.warn("Failed to close connection: #{e.message}")
     end

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.3' unless defined?(VERSION)
+  VERSION = '0.31.5' unless defined?(VERSION)
 end

metadata

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