diode 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea33eabe22d4cdc90c861901276c3c1f9f397d631c3aba3b9a541f1f87390189
-  data.tar.gz: 3d5616c2b0a342f229b49a3e7c27c77c4c255484c21876f2cdfadf7cbe7a4ffa
+  metadata.gz: 9ea759707873eb1e4b875b88f3592a9943bda41f0e7e2b734a02f97907a3418e
+  data.tar.gz: 57be21fb601cdb86a63b82f4bb61d1ea7950f1b308099303425cadcf16be99bb
 SHA512:
-  metadata.gz: 8ccade8f6c924359da6ebe142220351b5462015bfee482399cd7e52fb09ef2349df610c6d2e149d9128a4f76af0fc56c8c14b1fcc1dc44337d456379c333b903
-  data.tar.gz: 31869f03329647cac6f4a5d7746d1801683105b538b5c98cfdb3bad0643153b39044f7611de323b84061e503b4f4ee2baacd959100821d5086fd181da318cec9
+  metadata.gz: 3adb8476510156d01dff10b3b66130a1dc91e65710416c1a4ee07fb43513758172efca9701b876e7d6c5c87e09561842d437c5445c4a03fc352737ac3e5b9f37
+  data.tar.gz: 34dceb159914710b19af8e4683de8f361206574aabd6dfaf0fb9b29d76b23a82f7b482af2370d98c0e244823c1b1f697643d48301fd0d91b6c48b10b5307daa6

data/lib/diode/pgate.rb

@@ -0,0 +1,71 @@
+# pgate - Postgresql connection pooling
+require 'pg'
+
+module Diode
+class Pgate
+  attr_accessor(:max, :min, :connHash)
+  attr_reader(:pool, :inuse)
+
+  def initialize(connectionHash, max=10, min=1)
+    @connHash = connectionHash
+    @max = max || 10
+    @min = min || 1
+    @pool = []
+    @inuse = []
+    @running = true
+    Thread.new() {
+      curate() while @running
+    }
+  end
+
+  def assign()
+    conn = nil
+    return nil unless @running
+    if @pool.empty?
+      conn = PG::Connection.new(@connHash) if @inuse.size < @max
+      @inuse << conn
+      return(conn)
+    else
+      conn = @pool.shift()
+      return(assign()) unless ok?(conn) # recurse if bad connection
+      @inuse << conn
+      return(conn)
+    end
+  end
+
+  def release(conn) # return conn to pool if its alive, else discard it
+    @inuse.delete(conn) if @inuse.include?(conn)
+    @pool << conn if ok?(conn)
+  end
+
+  def ok?(conn)
+    return false unless conn.respond_to?(:conninfo)
+    begin
+      conn.conninfo()
+      return(true)
+    rescue PG::ConnectionBad => e
+      return(false)
+    end
+  end
+
+  def curate()
+    if @pool.size + @inuse.size > @max
+      unless @pool.empty?
+        conn = @pool.shift()
+        conn.close
+      end
+    end
+    if @pool.size + @inuse.size < @min
+      @pool << conn = PG::Connection.new(@connHash)
+    end
+    sleep(30)
+  end
+
+  def shutdown()
+    @running = false
+    (@pool + @inuse).each{|c| c.close() }
+  end
+
+end
+end
+# load 'pgate.rb'; h = {host: "127.0.0.1", port: 7000, dbname: 'admin', user: 'richard', password: 'redacted24'};  pool = Diode::Pgate.new(h)

data/lib/diode/static.rb

@@ -12,8 +12,8 @@ class Static
 
   def serve(request)
     return Diode::Response.standard(405) unless request.method == "GET"
-    unless guardian.nil?
-      securityResponse = guardian.call(request)
+    unless @guardian.nil?
+      securityResponse = @guardian.call(request)
       unless securityResponse.nil? or securityResponse == 200
         return securityResponse if securityResponse.is_a?(Diode::Response)
         return Diode::Response.standard(securityResponse) if [400,403,404,405].include?(securityResponse)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diode
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Kjell Koda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-20 00:00:00.000000000 Z
+date: 2024-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -48,6 +48,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/diode/pgate.rb
 - lib/diode/request.rb
 - lib/diode/response.rb
 - lib/diode/server.rb