em_mysql2_connection_pool 0.0.4 → 0.0.5

data/lib/em_mysql2_connection_pool.rb

@@ -14,29 +14,43 @@ class EmMysql2ConnectionPool
     
     def execute(connection, &block)
       @busy = true
-      q = connection.query sql(connection), @opts
+      @query_text = sql(connection)
+      q = connection.query @query_text, @opts
       q.callback{ |result| succeed result, connection.affected_rows, &block }
-      q.errback{  |error|  fail    error, &block }
+      q.errback{  |error|  fail error, &block }
       return q
     end
     
     def succeed(result, affected_rows, &block)
       @deferrable.succeed result, affected_rows
+    rescue StandardError => error
+      fail error
     ensure
       @busy and block.call
       @busy = false
     end
+    
     def fail(error, &block)
-      @deferrable.fail error
+      @deferrable.errback &default_errback unless has_errbacks?
+      @deferrable.fail error, @query_text
     ensure
       @busy and block.call
       @busy = false
     end
     
+    def has_errbacks?
+      !@deferrable.errbacks.nil?
+    end
+    
+    def default_errback
+      proc{ |error, sql| puts "#{error.class}: '#{error.message}' with query #{sql} in #{error.backtrace.first}" }
+    end
+    
   end
   
   def initialize(conf)
     @pool_size   = conf[:size] || 10
+    @on_error    = conf[:on_error]
     @query_queue = EM::Queue.new
     start_queue conf
   end
@@ -59,10 +73,23 @@ class EmMysql2ConnectionPool
     end
   end
   
+  def on_error(&block)
+    @on_error = block
+  end
+  
   def query(sql, opts={})
-    deferrable = EM::DefaultDeferrable.new
+    deferrable = EM::DefaultDeferrableWithErrbacksAccessor.new
     deferrable.callback{ |result,affected_rows| yield result, affected_rows } if block_given?
+    deferrable.errback &@on_error if @on_error
+    
     @query_queue.push Query.new(sql, opts, deferrable)
     deferrable
   end
 end
+
+module EventMachine
+  class DefaultDeferrableWithErrbacksAccessor
+    include Deferrable
+    attr_accessor :errbacks
+  end
+end

data/lib/em_mysql2_connection_pool/version.rb

@@ -1,3 +1,3 @@
 module EmMysql2ConnectionPool
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -2,7 +2,7 @@
 name: em_mysql2_connection_pool
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Niko Dittmann
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 +02:00
-default_executable: 
+date: 2011-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mysql2
@@ -57,7 +56,6 @@ extra_rdoc_files: []
 files: 
 - lib/em_mysql2_connection_pool/version.rb
 - lib/em_mysql2_connection_pool.rb
-has_rdoc: true
 homepage: http://github.com/niko/em_mysql2_connection_pool
 licenses: []
 
@@ -81,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: em_mysql2_connection_pool
-rubygems_version: 1.5.0
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: a simple connection pool for Mysql2::EM connections