em-pg-client 0.2.0.pre.1 → 0.2.0.pre.2

data/HISTORY.rdoc

@@ -1,10 +1,17 @@
-next release
+0.2.0.pre.2
+- errors from consume_input fails deferrable
+- query_timeout now measures only network response timeout, 
+  so it's not fired for large datasets
+
+0.2.0.pre.1
+- added query_timeout feature for async query commands
 - added connect_timeout property with for async connect/reset
 - fix: async_autoreconnect for tcp/ip connections
 - fix: async_* does not raise errors; errors handled by deferrable
 - rework async_autoreconnect in fully async manner
 - added async_connect() and #async_reset()
 - API change: on_reconnect -> on_autoreconnect
+
 0.1.1
 - added on_reconnect callback
 - docs updated

data/em-pg-client.gemspec

@@ -2,7 +2,7 @@ $:.unshift "lib"
 
 Gem::Specification.new do |s|
   s.name = "em-pg-client"
-  s.version = "0.2.0.pre.1"
+  s.version = "0.2.0.pre.2"
   s.required_ruby_version = ">= 1.9.1"
   s.date = "#{Time.now.strftime("%Y-%m-%d")}"
   s.summary = "EventMachine PostgreSQL client"

data/lib/pg/em.rb

@@ -135,31 +135,44 @@ module PG
           @deferrable = deferrable
           @send_proc = send_proc
           if (timeout = client.query_timeout) > 0
-            @timer = ::EM::Timer.new(timeout) do
+            @notify_timestamp = Time.now
+            setup_timer timeout
+          else
+            @timer = nil
+          end
+        end
+        
+        def setup_timer(timeout, adjustment = 0)
+          @timer = ::EM::Timer.new(timeout - adjustment) do
+            if (last_interval = Time.now - @notify_timestamp) >= timeout
               detach
               @client.async_command_aborted = true
               IO.for_fd(@client.socket).close # break connection now (hack)
               @deferrable.protect do
                 raise PG::Error, "query timeout expired (async)"
               end
+            else
+              setup_timer timeout, last_interval
             end
           end
         end
 
         def notify_readable
+          @notify_timestamp = Time.now if @timer
           @client.consume_input
-          return if @client.is_busy
-          @timer.cancel if @timer
-          detach
-          begin
-            result = @client.get_last_result
-          rescue PG::Error => e
-            @client.async_autoreconnect!(@deferrable, e, &@send_proc)
-          rescue Exception => e
-            @deferrable.fail(e)
+          result = if @client.is_busy
+            false
           else
-            @deferrable.succeed(result)
+            @timer.cancel if @timer
+            detach
+            @client.get_last_result
           end
+        rescue PG::Error => e
+          @client.async_autoreconnect!(@deferrable, e, &@send_proc)
+        rescue Exception => e
+          @deferrable.fail(e)
+        else
+          @deferrable.succeed(result) unless result == false
         end
       end
 

metadata

@@ -2,7 +2,7 @@
 name: em-pg-client
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.2.0.pre.1
+  version: 0.2.0.pre.2
 platform: ruby
 authors: 
 - Rafal Michalski