stack-service-base 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2621f0ec84cd69a2d9e0294f4e06c379e5ed17b48e01cc5f696f643d401e32be
-  data.tar.gz: 62e8ce865f81aa6d65de1254b34e61c544aca77a44f466bcbaeabb5079a11b39
+  metadata.gz: 57b5474b1774d7f28bad212eef759c57005c33c905e7a84cf8ef2ffd703456a5
+  data.tar.gz: 2ec3fe1f5b677cc6d5470eb27917a76bd05d0ae77cfa9119de139399e003a4f0
 SHA512:
-  metadata.gz: 0f2a2d7efbd4c17e7a1812758f652470d129dc59c022cc1f47080e028b2571e50ac8111a5fb6796e439fb6b6827ac5a47e8405801446006fff521b5a58ea3033
-  data.tar.gz: 17f104df5e8525a02f1ac8732ecc524d93a73c63cc1124b35422e412d18a72469542650f8abb6125c9f6ff866d4b324ad2fb5cef04df236760fd98333d6e9642
+  metadata.gz: f65f78c9ddd2261bc215aca0692774b148f968236b9c2cbb767b3b0c43832adc049f96ab9a79d98d6b7c7d1c5ab96ca987398e980daed7646b9f8448cbc8a90a
+  data.tar.gz: fa2192cfce9208ac0c72f46c0d75383fdb4f0d73f3cc93d75c24e87ae4398d480857e050502aa9052af8f125092103183b3f90abaf7b1a659dfbf614e0bc61a7

data/lib/stack-service-base/fiber_pool.rb

@@ -2,29 +2,31 @@ require 'sequel'
 require 'async/semaphore'
 # $stdout.sync = true
 
+$local_log = -> msg do
+  otl_current_span{ |span|
+    span.add_event("FiberPool", attributes: {
+      F: Fiber.current.__id__, T: Thread.current.__id__, A: self.__id__,
+      message: msg
+    }.transform_keys(&:to_s) )
+  }
+
+  return if defined? PERFORMANCE
+  $stdout.puts "F:#{Fiber.current.__id__} : T:#{Thread.current.__id__} : A:#{self.__id__} : #{msg}"
+  # LOGGER.debug :fiber_pool, msg
+end
+
+
+
 class FiberConnectionPool < Sequel::ConnectionPool
   VALIDATION_TIMEOUT = 20
   POOL_SIZE = 10
 
-  def log(msg)
-    otl_current_span{ |span|
-      span.add_event("FiberPool", attributes: {
-        F: Fiber.current.__id__, T: Thread.current.__id__, A: self.__id__,
-        message: msg
-      }.transform_keys(&:to_s) )
-    }
-
-    return if defined? PERFORMANCE
-    $stdout.puts "F:#{Fiber.current.__id__} : T:#{Thread.current.__id__} : A:#{self.__id__} : #{msg}"
-    # LOGGER.debug :fiber_pool, msg
-  end
-
   def initialize(db, opts = OPTS)
     otl_span "FiberConnectionPool.initialize" do |span|
       super
       @allocator = ->() {
         make_new(:default).tap { |conn|
-          log "new connection (fiber pool) #{conn}"
+          $local_log["new connection (fiber pool) #{conn}"]
         }
       }
       @stock = []
@@ -44,7 +46,7 @@ class FiberConnectionPool < Sequel::ConnectionPool
 
   def hold(_server = nil)
     return yield @acquired[Fiber.current] if @acquired[Fiber.current] # protect from recursion
-    log "hold in (fiber pool: #{__id__}) #{@stock.map{_1.__id__}}"
+    $local_log["hold in (fiber pool: #{__id__}) #{@stock.map{_1.__id__}}"]
     fiber = Fiber.current
     try_count = 2
 
@@ -60,19 +62,19 @@ class FiberConnectionPool < Sequel::ConnectionPool
       yield @acquired[fiber]
 
     rescue Sequel::DatabaseDisconnectError => e
-      log "remove connection (fiber pool) retry(#{try_count})"
+      $local_log["remove connection (fiber pool) retry(#{try_count})"]
       @acquired.delete(fiber)
       (try_count -=1) < 0 ? raise : retry
 
     rescue =>e
       $stdout.puts e.message
       $stdout.puts e.backtrace[0..10].join "\n"
-      log 'remove connection (fiber pool) give up'
+      $local_log['remove connection (fiber pool) give up']
       @acquired.delete(fiber)
       raise
     ensure
       @stock.push @acquired.delete(fiber) if @acquired[fiber]
-      log "hold out (fiber pool: #{__id__}) #{@stock.map{_1.__id__}}"
+      $local_log["hold out (fiber pool: #{__id__}) #{@stock.map{_1.__id__}}"]
     end
   end
 
@@ -81,7 +83,7 @@ class FiberConnectionPool < Sequel::ConnectionPool
   # def preconnect(_concurrent = false) = :unimplemented
   def disconnect(symbol)
     until @stock.empty?
-      log 'disconnect connection (fiber pool)'
+      $local_log['disconnect connection (fiber pool)']
       @stock.shift.close
     end
   end
@@ -100,10 +102,10 @@ require 'sequel/adapters/postgres'
 class Sequel::Postgres::Adapter
   def execute_query(sql, args)
     $stdout.puts "F:#{Fiber.current.__id__} : T:#{Thread.current.__id__} : A:#{self.__id__} : #{sql[0..60]}" unless defined? PERFORMANCE
-    # log "query: #{sql.slice(0, 60)}"
+    $local_log["query: #{sql.slice(0, 60)}"]
     @db.log_connection_yield(sql, self, args){args ? async_exec_params(sql, args) : async_exec(sql)}
   rescue => e
-    # log "Error: #{e.message}"
+    $local_log["Error: #{e.message}"]
     $stdout.puts e.message
     raise
   end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module StackServiceBase
   class Base
-    VERSION = '0.0.20'
+    VERSION = '0.0.21'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack-service-base
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - ''