bunny-ext 0.6.1

data/.gitignore

@@ -0,0 +1,4 @@
+pkg/*
+*.gem
+.bundle
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in bunny-ext.gemspec
+gemspec

data/Rakefile

@@ -0,0 +1,14 @@
+require 'rake'
+require 'rake/testtask'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+end
+
+task :default do
+  Rake::Task[:test].invoke
+end

data/bunny-ext.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "bunny-ext/version"
+
+Gem::Specification.new do |s|
+  s.name        = "bunny-ext"
+  s.version     = Bunny::Ext::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Stefan Kaes", "Pascal Friederich"]
+  s.email       = ["developers@xing.com"]
+  s.homepage    = ""
+  s.summary     = %q{Reliable socket timeouts for the Bunny amqp gem}
+
+  s.rubyforge_project = "bunny-ext"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.add_dependency('bunny', '= 0.6.0')
+end

data/lib/bunny-ext/bunny/client08.rb

@@ -0,0 +1,42 @@
+module Bunny
+  class Client < Qrack::Client
+    # Overwritten with a version that uses Bunny::Timer::timeout
+    # instead of Object#timeout which is either timeout.rb (ruby 1.9.x)
+    # or SystemTimer (ruby 1.8.x)
+    # read: http://ph7spot.com/musings/system-timer
+    def next_frame(opts = {})
+      frame = nil
+
+      case
+        when channel.frame_buffer.size > 0
+          frame = channel.frame_buffer.shift
+        when opts.has_key?(:timeout)
+          Bunny::Timer::timeout(opts[:timeout], Qrack::ClientTimeout) do
+            frame = Qrack::Transport::Frame.parse(buffer)
+          end
+        else
+          frame = Qrack::Transport::Frame.parse(buffer)
+      end
+
+      @logger.info("received") { frame } if @logging
+        
+      raise Bunny::ConnectionError, 'No connection to server' if (frame.nil? and !connecting?)
+
+      # Monitor server activity and discard heartbeats
+      @message_in = true
+
+      case
+        when frame.is_a?(Qrack::Transport::Heartbeat)
+          next_frame(opts)
+        when frame.nil?
+          frame
+        when ((frame.channel != channel.number) and (frame.channel != 0))
+          channel.frame_buffer << frame
+          next_frame(opts)
+        else
+          frame
+      end
+
+    end
+  end
+end

data/lib/bunny-ext/bunny/client09.rb

@@ -0,0 +1,42 @@
+module Bunny
+  class Client < Qrack::Client
+    # Overwritten with a version that uses Bunny::Timer::timeout
+    # instead of Object#timeout which is either timeout.rb (ruby 1.9.x)
+    # or SystemTimer (ruby 1.8.x)
+    # read: http://ph7spot.com/musings/system-timer
+    def next_frame(opts = {})
+      frame = nil
+      
+      case
+        when channel.frame_buffer.size > 0
+          frame = channel.frame_buffer.shift
+        when opts.has_key?(:timeout)
+          Bunny::Timer::timeout(opts[:timeout], Qrack::ClientTimeout) do
+            frame = Qrack::Transport09::Frame.parse(buffer)
+          end
+        else
+          frame = Qrack::Transport09::Frame.parse(buffer)
+      end
+      
+      @logger.info("received") { frame } if @logging
+            
+      raise Bunny::ConnectionError, 'No connection to server' if (frame.nil? and !connecting?)
+      
+      # Monitor server activity and discard heartbeats
+      @message_in = true
+      
+      case
+        when frame.is_a?(Qrack::Transport09::Heartbeat)
+          next_frame(opts)
+        when frame.nil?
+          frame
+        when ((frame.channel != channel.number) and (frame.channel != 0))
+          channel.frame_buffer << frame
+          next_frame(opts)
+        else
+          frame
+      end
+      
+    end
+  end
+end

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

@@ -0,0 +1,82 @@
+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
+      @socket_timeout = opts[:socket_timeout] || SOCKET_TIMEOUT
+      @use_timeout = RUBY_VERSION >= "1.9"
+    end
+    alias initialize initialize_with_timeout_opts
+
+    # Overwritten with a version that uses Bunny::Timer::timeout
+    # instead of Object#timeout which is either timeout.rb (ruby 1.9.x)
+    # or SystemTimer (ruby 1.8.x)
+    # read: http://ph7spot.com/musings/system-timer
+    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
+            @socket.__send__(cmd, *args)
+          end
+        else
+          @socket.__send__(cmd, *args)
+        end
+      rescue Errno::EPIPE, Errno::EAGAIN, Qrack::ClientTimeout, IOError => e
+        raise Bunny::ServerDownError, e.message
+      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?
+
+      begin
+        # Attempt to connect.
+        @socket = Bunny::Timer::timeout(@connect_timeout, ConnectionTimeout) do
+          TCPSocket.new(host, port)
+        end
+
+        if Socket.constants.include? 'TCP_NODELAY'
+          @socket.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
+        end
+
+        if @ssl
+          require 'openssl' unless defined? OpenSSL::SSL
+          @socket = OpenSSL::SSL::SSLSocket.new(@socket)
+          @socket.sync_close = true
+          @socket.connect
+          @socket.post_connection_check(host) if @verify_ssl
+          @socket
+        end
+      rescue => e
+        @status = :not_connected
+        raise Bunny::ServerDownError, e.message
+      end
+
+      set_socket_timeouts
+
+      @socket
+    end
+  end
+end

data/lib/bunny-ext/version.rb

@@ -0,0 +1,5 @@
+module Bunny
+  module Ext
+    VERSION = "0.6.1"
+  end
+end

data/lib/bunny-ext.rb

@@ -0,0 +1,43 @@
+require 'bunny'
+
+module Bunny
+  Timer = if RUBY_VERSION < "1.9"
+            begin
+              require 'system_timer'
+              SystemTimer
+            rescue LoadError
+              Timeout
+            end
+          else
+            Timeout
+          end
+
+  private
+  def self.setup(version, opts)  
+    if version == '08'
+      # AMQP 0-8 specification
+      require 'qrack/qrack08'
+      require 'bunny-ext/qrack/client'
+      require 'bunny/client08'
+      require 'bunny-ext/bunny/client08'
+      require 'bunny/exchange08'
+      require 'bunny/queue08'
+      require 'bunny/channel08'
+      require 'bunny/subscription08'
+
+      client = Bunny::Client.new(opts)
+    else
+      # AMQP 0-9-1 specification
+      require 'qrack/qrack09'
+      require 'bunny-ext/qrack/client'
+      require 'bunny/client09'
+      require 'bunny-ext/bunny/client09'
+      require 'bunny/exchange09'
+      require 'bunny/queue09'
+      require 'bunny/channel09'
+      require 'bunny/subscription09'
+
+      client = Bunny::Client09.new(opts)
+    end
+  end
+end

data/test/bunny-ext/qrack_client_ext_test.rb

@@ -0,0 +1,8 @@
+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"
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require 'rubygems'
+require 'test/unit'
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'bunny-ext'

metadata

@@ -0,0 +1,95 @@
+--- !ruby/object:Gem::Specification 
+name: bunny-ext
+version: !ruby/object:Gem::Version 
+  hash: 5
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 1
+  version: 0.6.1
+platform: ruby
+authors: 
+- Stefan Kaes
+- Pascal Friederich
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-11-19 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bunny
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id001
+description: 
+email: 
+- developers@xing.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- .gitignore
+- Gemfile
+- Rakefile
+- bunny-ext.gemspec
+- lib/bunny-ext.rb
+- lib/bunny-ext/bunny/client08.rb
+- lib/bunny-ext/bunny/client09.rb
+- lib/bunny-ext/qrack/client.rb
+- lib/bunny-ext/version.rb
+- test/bunny-ext/qrack_client_ext_test.rb
+- test/test_helper.rb
+has_rdoc: true
+homepage: ""
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: []
+
+rubyforge_project: bunny-ext
+rubygems_version: 1.3.7
+signing_key: 
+specification_version: 3
+summary: Reliable socket timeouts for the Bunny amqp gem
+test_files: 
+- test/bunny-ext/qrack_client_ext_test.rb
+- test/test_helper.rb