em-sequel-async 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/em-sequel-async.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "em-sequel-async"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Tadman"]
-  s.date = "2012-11-15"
+  s.date = "2012-11-22"
   s.description = "Implements a number of asynchronous helper methods for Sequel"
   s.email = "scott@twg.ca"
   s.extra_rdoc_files = [

data/lib/em-sequel-async/mysql.rb

@@ -94,6 +94,11 @@ class EmSequelAsync::Mysql
       end
     end
 
+    def remove(connection)
+      @connections.delete(connection)
+      @connections_active.delete(connection)
+    end
+
     def delegate_query(connection, query, callback)
       @connections[connection] = [ query, callback ]
 
@@ -108,12 +113,38 @@ class EmSequelAsync::Mysql
         self.add(connection)
       end
       deferrable.errback do |err|
-        log(:error, "(%.6fs) [ERR] %s (%s: %s)" % [ Time.now - start, query, err.class, err ])
-        log(:error, err.backtrace)
+        handled = false
 
-        callback and callback.call(false, (Time.now - start).to_f, connection, err)
+        case (err)
+        when Mysql2::Error
+          case (err.message)
+          when /^Deadlock/i
+            self.delegate_query(connection, query, callback)
 
-        self.add(connection)
+            handled = true
+          when /Duplicate entry/i
+            callback and callback.call(nil, (Time.now - start).to_f, connection, err)
+
+            self.add(connection)
+
+            handled = true
+          when /MySQL server has gone away|Lost connection/i
+            @query_queue << [ query, callback ]
+
+            self.remove(connection)
+
+            handled = true
+          end
+        end
+
+        unless (handled)
+          log(:error, "(%.6fs) [ERR] %s (%s: %s)" % [ Time.now - start, query, err.class, err ])
+          log(:error, err.backtrace)
+
+          callback and callback.call(false, (Time.now - start).to_f, connection, err)
+
+          self.add(connection)
+        end
       end
     end
     
@@ -127,6 +158,14 @@ class EmSequelAsync::Mysql
       @connections_active[connection] = true
       
       connection
+
+    rescue Mysql2::Error => err
+      case (err.message)
+      when /Too many connections/i
+        return
+      else
+        raise err
+      end
     end
 
     def query(query, callback = nil, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-sequel-async
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel