semian 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47d9f8254a2231b2ca3210ff09331ace5bd23f86bfe0f178a95e64187d3f1203
-  data.tar.gz: 644bcb5a30040499af851b17a9cb46c7a2a4fe0a3896cfd7052bc39e115fb4bc
+  metadata.gz: bd8decd384592d21ffffd5d5300099c9bf7a0971e7a385fb84288bd2661fa165
+  data.tar.gz: 3cd2627d985a29ab04a8b28f27bd0f12756f182a6919b86f5ae1821751f3ccf5
 SHA512:
-  metadata.gz: b3d5769728bd70009178ad78d1b397b5a067e2482578e0916ae76963870cc9808499a49cd5a22f6a3ffa254cbb203f5dec37584352815cb9ba32a8a281432468
-  data.tar.gz: 7ea88141334bed5ecf490f25bd3b8d98759de50f38824af6f0af70619f0688eeacea05c80181a079fb3563d887fc1d1dbc6840893eb4a8c78e729a1c4b498b94
+  metadata.gz: f14a28ea47bf2ffd290ae0d01535361a5a13e3f85debcad18c0801c367a13dc3bbc0e23280bf339c9c9cd098ec7a0d03eaf3c853d11c57911d2fe561750112f2
+  data.tar.gz: fbde9d094a74317531b55df4075b63b9cc69337a44fdf6212f8ca2c350c2d2084b3b6a8b4cc0762b70ae4ac574fbd0b0c13decd378f191394b07fb6553fb0293

data/ext/semian/extconf.rb

@@ -15,6 +15,8 @@ end
 
 require "mkmf"
 
+dir_config("openssl")
+
 abort "openssl is missing. please install openssl." unless find_header("openssl/sha.h")
 abort "openssl is missing. please install openssl." unless find_library("crypto", "SHA1")
 

data/ext/semian/resource.c

@@ -359,12 +359,6 @@ ms_to_timespec(long ms, struct timespec *ts)
   ts->tv_nsec = (ms % 1000) * 1000000;
 }
 
-static void
-semian_resource_mark(void *ptr)
-{
-  /* noop */
-}
-
 static void
 semian_resource_free(void *ptr)
 {
@@ -386,7 +380,7 @@ static const rb_data_type_t
 semian_resource_type = {
   "semian_resource",
   {
-    semian_resource_mark,
+    NULL,
     semian_resource_free,
     semian_resource_memsize
   },

data/lib/semian/activerecord_trilogy_adapter.rb

@@ -9,7 +9,7 @@ module ActiveRecord
     class TrilogyAdapter
       ActiveRecord::ActiveRecordError.include(::Semian::AdapterError)
 
-      class SemianError < StatementInvalid
+      class SemianError < ConnectionNotEstablished
         def initialize(semian_identifier, *args)
           super(*args)
           @semian_identifier = semian_identifier
@@ -47,16 +47,16 @@ module Semian
       super
     end
 
-    def execute(sql, *)
+    def raw_execute(sql, *)
       if query_allowlisted?(sql)
         super
       else
-        acquire_semian_resource(adapter: :trilogy_adapter, scope: :execute) do
+        acquire_semian_resource(adapter: :trilogy_adapter, scope: :query) do
           super
         end
       end
     end
-    ruby2_keywords :execute
+    ruby2_keywords :raw_execute
 
     def active?
       acquire_semian_resource(adapter: :trilogy_adapter, scope: :ping) do
@@ -82,18 +82,12 @@ module Semian
 
     private
 
-    def acquire_semian_resource(**)
-      super
-    rescue ActiveRecord::StatementInvalid => error
-      if error.cause.is_a?(Trilogy::TimeoutError)
-        semian_resource.mark_failed(error)
-        error.semian_identifier = semian_identifier
-      end
-      raise
-    end
-
     def resource_exceptions
-      [ActiveRecord::ConnectionNotEstablished]
+      [
+        ActiveRecord::AdapterTimeout,
+        ActiveRecord::ConnectionFailed,
+        ActiveRecord::ConnectionNotEstablished,
+      ]
     end
 
     # TODO: share this with Mysql2

data/lib/semian/mysql2.rb

@@ -22,8 +22,8 @@ module Semian
     include Semian::Adapter
 
     CONNECTION_ERROR = Regexp.union(
-      /Can't connect to MySQL server on/i,
-      /Lost connection to MySQL server/i,
+      /Can't connect to (?:MySQL )?server on/i,
+      /Lost connection to (?:MySQL )?server/i,
       /MySQL server has gone away/i,
       /Too many connections/i,
       /closed MySQL connection/i,

data/lib/semian/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Semian
-  VERSION = "0.19.0"
+  VERSION = "0.20.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Scott Francis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies: []
 description: |2
       A Ruby C extention that is used to control access to shared resources
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.21
 signing_key: 
 specification_version: 4
 summary: Bulkheading for Ruby with SysV semaphores