bunny-ext 0.6.4 → 0.6.5

data/lib/bunny-ext/qrack/client.rb

@@ -3,13 +3,12 @@ require 'qrack/client'
 
 module Qrack
   class Client
-    SOCKET_TIMEOUT  = 5.0
 
     alias initialize_without_timeout_opts initialize
     def initialize_with_timeout_opts(opts = {})
       initialize_without_timeout_opts(opts)
-      @socket_timeout = opts[:socket_timeout] || SOCKET_TIMEOUT
-      @use_timeout = RUBY_VERSION >= "1.9"
+      @read_write_timeout = opts[:socket_timeout]
+      @read_write_timeout = nil if @read_write_timeout == 0
     end
     alias initialize initialize_with_timeout_opts
 
@@ -20,8 +19,8 @@ module Qrack
     def send_command(cmd, *args)
       begin
         raise Bunny::ConnectionError, 'No connection - socket has not been created' if !@socket
-        if @use_timeout
-          Bunny::Timer::timeout(@socket_timeout, Qrack::ClientTimeout) do
+        if @read_write_timeout
+          Bunny::Timer::timeout(@read_write_timeout, Qrack::ClientTimeout) do
             @socket.__send__(cmd, *args)
           end
         else
@@ -32,22 +31,6 @@ module Qrack
       end
     end
 
-    # Set socket send and receive timeouts and let the operating system deal
-    # with these timeouts. If setting those isn't supported (for example on solaris)
-    # we use the Bunny::Timer::timeout method to wrap all socket accesses
-    def set_socket_timeouts
-      return if @status == :not_connected
-      secs   = Integer(@socket_timeout)
-      usecs  = Integer((@socket_timeout - secs) * 1_000_000)
-      optval = [secs, usecs].pack("l_2")
-      begin
-        @socket.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
-        @socket.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
-      rescue Errno::ENOPROTOOPT
-        @use_timeout = true
-      end
-    end
-
     def socket
       return @socket if @socket and (@status == :connected) and not @socket.closed?
 
@@ -74,19 +57,21 @@ module Qrack
         raise Bunny::ServerDownError, e.message
       end
 
-      set_socket_timeouts
-
       @socket
     end
 
+    def disconnect_timeout
+      @read_write_timeout || @connect_timeout
+    end
+
     def close
       return if @socket.nil? || @socket.closed?
 
       # Close all active channels
-      channels.each { |c| Bunny::Timer::timeout(@socket_timeout) { c.close if c.open? } }
+      channels.each { |c| Bunny::Timer::timeout(disconnect_timeout) { c.close if c.open? } }
 
       # Close connection to AMQP server
-      Bunny::Timer::timeout(@socket_timeout) { close_connection }
+      Bunny::Timer::timeout(disconnect_timeout) { close_connection }
     rescue Exception
       # http://http://cheezburger.com/Asset/View/4033311488
     ensure

data/lib/bunny-ext/version.rb

@@ -1,5 +1,5 @@
 module Bunny
   module Ext
-    VERSION = "0.6.4"
+    VERSION = "0.6.5"
   end
 end

data/test/bunny-ext/qrack_client_ext_test.rb

@@ -1,8 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class QrackClientExtTest < Test::Unit::TestCase
-  def test_should_monkeypatch_the_client_class
-    Bunny.send :setup, "0.8", {}
-    assert Bunny::Client.instance_methods.include? "set_socket_timeouts"
+  def test_nothing
+    assert true
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bunny-ext
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +01:00
+date: 2010-12-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency