mysql_framework 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 089e9d32caf37e266ed17f4c366511814de266b3feaeed97c24781e4f7989de0
-  data.tar.gz: b566cdb40dc0466cc4b2878cc0e994fc252131350e79467e83e32b608717293e
+  metadata.gz: 4cd76e0de90b8c56e1ae4d941f054b34d578e60a98bfc0e81edc37027610ae7b
+  data.tar.gz: b3059ba0eb90274b18211fc5efcf6a01a7eb6ad68c7397fbfa7964747638dd37
 SHA512:
-  metadata.gz: 39624dce18fedfc9cc8664c9428bd431fd4f7a773239b7cac6e22cba403c2d839809b55ac82dc12c7f81685f3dbd060f00eda2542db3b871499278a2188f328c
-  data.tar.gz: 21f989dec1fd8399d119e50f038b18679361f924919151d36258468670955712d376c7bb0d928af12a1d60eab7cecae62af9111879dd191a371c7aa1b7420c0a
+  metadata.gz: 38d21a76909ce03ba7877483b6aa588a651a52839d9e2339e7700f71913173267c725577591e5767b9e9014ce14437d2518757beffbfba67bc8595f2329277d2
+  data.tar.gz: 0429588b4d222a0c361d1516ad5ec89118787f284e79c242bd506e60c9fa132a673637cd06e183809c1d03a0ae7fdd12bcc7ee193d7d939eef9f20b25ed8d98c

data/lib/mysql_framework/connector.rb

@@ -12,7 +12,7 @@ module MysqlFramework
     def setup
       @connection_pool = ::Queue.new
 
-      start_pool_size.times { @connection_pool.push(Mysql2::Client.new(@options)) }
+      start_pool_size.times { @connection_pool.push(new_client) }
 
       @created_connections = start_pool_size
     end
@@ -36,12 +36,17 @@ module MysqlFramework
 
     # This method is called to fetch a client from the connection pool.
     def check_out
-      @connection_pool.pop(true)
+      client = @connection_pool.pop(true)
+
+      # Prevent "mysql server has gone away" errors by detecting dead clients and creating a new one instead.
+      client = new_client if client.closed?
+
+      client
     rescue ThreadError
       if @created_connections < max_pool_size
-        conn = Mysql2::Client.new(@options)
+        client = new_client
         @created_connections += 1
-        return conn
+        return client
       end
 
       MysqlFramework.logger.error { "[#{self.class}] - Database connection pool depleted." }
@@ -116,6 +121,10 @@ module MysqlFramework
       }
     end
 
+    def new_client
+      Mysql2::Client.new(@options)
+    end
+
     def start_pool_size
       @start_pool_size ||= Integer(ENV.fetch('MYSQL_START_POOL_SIZE', 1))
     end

data/lib/mysql_framework/version.rb

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

data/spec/lib/mysql_framework/connector_spec.rb

@@ -23,7 +23,7 @@ describe MysqlFramework::Connector do
       reconnect: false
     }
   end
-  let(:client) { double(close: true) }
+  let(:client) { double(close: true, closed?: false) }
   let(:gems) { MysqlFramework::SqlTable.new('gems') }
   let(:existing_client) { Mysql2::Client.new(default_options) }
 
@@ -90,6 +90,20 @@ describe MysqlFramework::Connector do
       end
     end
 
+    context '' do
+      let(:closed_client) { double(close: true, closed?: true) }
+
+      before do
+        subject.connections.clear
+        subject.connections.push(closed_client)
+      end
+
+      it 'instantiates a new connection and returns it' do
+        expect(Mysql2::Client).to receive(:new).with(default_options).and_return(client)
+        expect(subject.check_out).to eq(client)
+      end
+    end
+
     context "when there are no available connections, and the pool's max size has not been reached" do
       before do
         subject.connections.clear

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_framework
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Sage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler