mysql_framework 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38653f6e3d1d849566574e58eb8386b4c32890370404cb3eade583b0070f5041
-  data.tar.gz: 5534eca9f224d13580cfd09f4e2478208857e5b353c9a664ed7b772bf8a088e1
+  metadata.gz: 87c4479177595f0b81fd81122c23473b63416ecf3a6427620c3cef4ba25d3e58
+  data.tar.gz: c668c3276dfe1120f7be7f8d30238bd1b8123c5559221ec175a1d3d844cc8e80
 SHA512:
-  metadata.gz: aa4e726ac90ac8b1ecd8ca20a64b4c33e81d003c395b49c340f712df500fc7879956f5479f9c23e53fe20ca947d41d2798ad42732c596a03ab219129f02a7dbd
-  data.tar.gz: ba2080bb5f7595b82996a48a0316ed70cf7560b5687abb9d5c9768c73f5e2b296e42378aa9139c80e2d5f705a8fa7bdb08167a740c019a6d5d0a0825436873e7
+  metadata.gz: fc44ac34b35b2c615ce87b8a1a627edc5d9f97c50f14ba3da1cae08e4089b0dcea405c495e48efbba95c852f2418334b3e1c32d029ae3fc4ec09f5d4028cf68d
+  data.tar.gz: 2eba7935da06a55d525b96126655f6a30415a62cf31225f184a0a305571f4e2f83a292a7214c446b63c01cbdd005b652bf30a2796bcb2e24f8644e8a8182830c

data/lib/mysql_framework/connector.rb

@@ -4,6 +4,7 @@ module MysqlFramework
   class Connector
     def initialize(options = {})
       @options = default_options.merge(options)
+      @mutex = Mutex.new
 
       Mysql2::Client.default_query_options.merge!(symbolize_keys: true, cast_booleans: true)
     end
@@ -25,7 +26,7 @@ module MysqlFramework
 
       until @connection_pool.empty?
         conn = @connection_pool.pop(true)
-        conn.close
+        conn&.close
       end
 
       @connection_pool = nil
@@ -38,31 +39,37 @@ module MysqlFramework
 
     # This method is called to fetch a client from the connection pool.
     def check_out
-      return new_client unless connection_pool_enabled?
+      @mutex.synchronize do
+        begin
+          return new_client unless connection_pool_enabled?
 
-      client = @connection_pool.pop(true)
+          client = @connection_pool.pop(true)
 
-      client.ping if @options[:reconnect]
+          client.ping if @options[:reconnect]
 
-      client
-    rescue ThreadError
-      if @created_connections < max_pool_size
-        client = new_client
-        @created_connections += 1
-        return client
-      end
+          client
+        rescue ThreadError
+          if @created_connections < max_pool_size
+            client = new_client
+            @created_connections += 1
+            return client
+          end
 
-      MysqlFramework.logger.error { "[#{self.class}] - Database connection pool depleted." }
+          MysqlFramework.logger.error { "[#{self.class}] - Database connection pool depleted." }
 
-      raise 'Database connection pool depleted.'
+          raise 'Database connection pool depleted.'
+        end
+      end
     end
 
     # This method is called to check a client back in to the connection when no longer needed.
     def check_in(client)
-      return client&.close unless connection_pool_enabled?
+      @mutex.synchronize do
+        return client&.close unless connection_pool_enabled?
 
-      client = new_client if client.nil? || client.closed?
-      @connection_pool.push(client)
+        client = new_client if client&.closed?
+        @connection_pool.push(client)
+      end
     end
 
     # This method is called to use a client from the connection pool.

data/lib/mysql_framework/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MysqlFramework
-  VERSION = '2.1.3'
+  VERSION = '2.1.4'
 end

data/spec/lib/mysql_framework/connector_spec.rb

@@ -118,6 +118,12 @@ describe MysqlFramework::Connector do
   end
 
   describe '#check_out' do
+    it 'calls synchronize on the mutex' do
+      expect(subject.instance_variable_get(:@mutex)).to receive(:synchronize)
+
+      subject.check_out
+    end
+
     context 'when connection pooling is enabled' do
       context 'when there are available connections' do
         before do
@@ -203,6 +209,12 @@ describe MysqlFramework::Connector do
   end
 
   describe '#check_in' do
+    it 'calls synchronize on the mutex' do
+      expect(subject.instance_variable_get(:@mutex)).to receive(:synchronize)
+
+      subject.check_out
+    end
+
     context 'when connection pooling is enabled' do
       it 'returns the provided client to the connection pool' do
         expect(subject.connections).to receive(:push).with(client)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_framework
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Sage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake