bunny 1.0.7 → 1.1.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 644fb83ebe90f39169723ddefd72ec581e7e055f
-  data.tar.gz: f359455c828d498288f5a1ac5aa1a34d008e6982
+  metadata.gz: 840a6fefa94a5fef22bdc0a24178ba01498160bb
+  data.tar.gz: 98b792aa4957d2109ce984742f7cb50551b6503d
 SHA512:
-  metadata.gz: 8ed7e1beffc8b2c86a509009664d9a648cd65afca1c4eebb2d049a157664135d53082a8032ce84373a505d2f964a042c117b46d16f106ee09ba6bbe71bbb0969
-  data.tar.gz: ef055f07569c758663bd0ed0507430d94062b5d4ab7bae8258bc475d9945f775df0b8f74463fbb2044bd63a9a785509a976b37e2fa58d51e89221116c4ff262c
+  metadata.gz: 2f50640dcc07103b1f4d6c54230d27ad658bc8b6870874d781718cfca9910abca7c489bbd44acfb8f6f42a237ddf24afe7c484d6a36ab820d18ad846d1ae5585
+  data.tar.gz: 40d9d577e9b65e43882011714cf5f956804818fc692b7d30adc5e131e97ee51ab5b1bcee07434dceb097a571436917bc602078aed331594b32231ef54a8bb2cc

data/ChangeLog.md

@@ -1,103 +1,18 @@
-## Changes between Bunny 1.0.6 and 1.0.7
+## Changes between Bunny 1.0.0 and 1.1.0.pre1
 
-### amq-protocol Update
-
-Minimum `amq-protocol` version is now `1.9.2` which includes
-bug fixes around singed 8 and 16 bit integer decoding.
-
-
-
-## Changes between Bunny 1.0.5 and 1.0.6
-
-### Better Exception Handling in Consumers
-
-Consumer work pools will now correctly catch all exceptions
-when dispatching submitted operations, not just `Bunny::Exception`
-subclasses.
-
-### TLS Without Peer Verification
-
-Bunny now successfully performs TLS upgrade when peer verification
-is disabled.
-
-Contribute by Jordan Curzon.
-
-### Bunny::Session#with_channel Ensures the Channel is Closed
-
-`Bunny::Session#with_channel` now makes sure the channel is closed
-even if provided block raises an exception
+### User-Provided Loggers
 
-Contributed by Carl Hoerberg.
+Bunny now can use any logger that provides the same API as Ruby standard library's `Logger`:
 
+``` ruby
+require "logger"
+require "stringio"
 
-### Channel Number = 0 is Rejected
-
-`Bunny::Session#create_channel` will now reject channel number 0.
-
-
-
-## Changes between Bunny 1.0.4 and 1.0.5
-
-### Single Threaded Mode Fixes
-
-Single threaded mode no longer fails with
-
-```
-undefined method `event_loop'
+io = StringIO.new
+# will log to `io`
+Bunny.new(:logger => Logger.new(io))
 ```
 
-### connection.tune.channel_max No Longer Overflows
-
-`connection.tune.channel_max` could previously be configured to values
-greater than 2^16 - 1 (65535). This would result in a silent overflow
-during serialization. The issue was harmless in practice but is still
-a bug that can be quite confusing.
-
-Bunny now caps max number of channels to 65535. This allows it to be
-forward compatible with future RabbitMQ versions that may allow limiting
-total # of open channels via server configuration.
-
-### Thread Leaks Fixes
-
-Bunny will now correctly release heartbeat sender when allocating
-a new one (usually happens only when connection recovers from a network
-failure).
-
-### amq-protocol Update
-
-Minimum `amq-protocol` version is now `1.9.0` which includes
-bug fixes and performance improvements for channel ID allocator.
-
-
-
-## Changes between Bunny 1.0.3 and 1.0.4
-
-### Versioned Delivery Tag Fix
-
-Versioned delivery tag now ensures all the arguments it operates
-(original delivery tag, atomic fixnum instances, etc) are coerced to `Integer`
-before comparison.
-
-GitHub issues: #171.
-
-## Changes between Bunny 1.0.2 and 1.0.3
-
-### Eliminated Errouneous Debug Statement
-
-`1.0.3` eliminates a debug log message that should have
-never made it into a commit.
-
-
-## Changes between Bunny 1.0.1 and 1.0.2
-
-### Fixes CPU Burn on JRuby
-
-A silly mistake in `1.0.1` testing process ended up reverting
-the fix for #165 and #166. This release corrects it.
-
-
-## Changes between Bunny 1.0.0 and 1.0.1
-
 ### Default CA's Paths Are Disabled on JRuby
 
 Bunny uses OpenSSL provided CA certificate paths. This
@@ -115,6 +30,7 @@ certain period of time (the frequency of `EWOULDBLOCK` being raised spiked
 sharply).
 
 
+
 ## Changes between Bunny 1.0.0.rc2 and 1.0.0.rc3
 
 ### [Authentication Failure Notification](http://www.rabbitmq.com/auth-notification.html) Support

data/bunny.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     map { |mail| Base64.decode64(mail) }
 
   # Dependencies
-  s.add_dependency "amq-protocol", ">= 1.9.2"
+  s.add_dependency "amq-protocol", ">= 1.8.0"
 
   # Files.
   s.has_rdoc = true

data/lib/bunny/channel.rb

@@ -1681,7 +1681,7 @@ module Bunny
           @threads_waiting_on_basic_get_continuations.delete(t)
         end
       else
-        connection.reader_loop.run_once until @basic_get_continuations.length > 0
+        connection.event_loop.run_once until @basic_get_continuations.length > 0
 
         @basic_get_continuations.pop
       end
@@ -1699,7 +1699,7 @@ module Bunny
           @threads_waiting_on_confirms_continuations.delete(t)
         end
       else
-        connection.reader_loop.run_once until @confirms_continuations.length > 0
+        connection.event_loop.run_once until @confirms_continuations.length > 0
 
         @confirms_continuations.pop
       end

data/lib/bunny/consumer_work_pool.rb

@@ -82,10 +82,10 @@ module Bunny
 
           begin
             callable.call
-          rescue ::Exception => e
-            # TODO: use connection logger
-            $stderr.puts e.class.name
-            $stderr.puts e.message
+          rescue Exception => e
+            # TODO
+            puts e.class.name
+            puts e.message
           end
         end
       end

data/lib/bunny/exceptions.rb

@@ -42,18 +42,6 @@ module Bunny
     end
   end
 
-  # Can indicate either a channel or connection-level issue
-  class NotAllowedError < Exception
-    attr_reader :connection, :connection_close
-
-    def initialize(message, connection, connection_close = nil)
-      super(message)
-
-      @connection       = connection
-      @connection_close = connection_close
-    end
-  end
-
 
   # Raised when TCP connection to RabbitMQ fails because of an unresolved
   # hostname, connectivity problem, etc

data/lib/bunny/session.rb

@@ -36,10 +36,6 @@ module Bunny
     DEFAULT_HEARTBEAT = :server
     # @private
     DEFAULT_FRAME_MAX = 131072
-    # 2^16 - 1, maximum representable signed 16 bit integer.
-    # @private
-    CHANNEL_MAX_LIMIT   = 65535
-    DEFAULT_CHANNEL_MAX = CHANNEL_MAX_LIMIT
 
     # backwards compatibility
     # @private
@@ -82,7 +78,7 @@ module Bunny
 
     # @return [Bunny::Transport]
     attr_reader :transport
-    attr_reader :status, :host, :port, :heartbeat, :user, :pass, :vhost, :frame_max, :channel_max, :threaded
+    attr_reader :status, :host, :port, :heartbeat, :user, :pass, :vhost, :frame_max, :threaded
     attr_reader :server_capabilities, :server_properties, :server_authentication_mechanisms, :server_locales
     attr_reader :default_channel
     attr_reader :channel_id_allocator
@@ -110,6 +106,7 @@ module Bunny
     # @option connection_string_or_opts [String] :tls_key (nil) Path to client TLS/SSL private key file (.pem)
     # @option connection_string_or_opts [Array<String>] :tls_ca_certificates Array of paths to TLS/SSL CA files (.pem), by default detected from OpenSSL configuration
     # @option connection_string_or_opts [Integer] :continuation_timeout (4000) Timeout for client operations that expect a response (e.g. {Bunny::Queue#get}), in milliseconds.
+    # @option connection_string_or_opts [Integer] :connection_timeout (5) Timeout in seconds for connecting to the server.
     #
     # @option optz [String] :auth_mechanism ("PLAIN") Authentication mechanism, PLAIN or EXTERNAL
     # @option optz [String] :locale ("PLAIN") Locale RabbitMQ should use
@@ -136,7 +133,7 @@ module Bunny
       @logfile         = opts[:log_file] || opts[:logfile] || STDOUT
       @threaded        = opts.fetch(:threaded, true)
 
-      self.init_logger(opts[:log_level] || ENV["BUNNY_LOG_LEVEL"] || Logger::WARN)
+      @logger          = opts.fetch(:logger, init_logger(opts[:log_level] || ENV["BUNNY_LOG_LEVEL"] || Logger::WARN))
 
       # should automatic recovery from network failures be used?
       @automatically_recover = if opts[:automatically_recover].nil? && opts[:automatic_recovery].nil?
@@ -153,9 +150,7 @@ module Bunny
 
       # these are negotiated with the broker during the connection tuning phase
       @client_frame_max   = opts.fetch(:frame_max, DEFAULT_FRAME_MAX)
-      @client_channel_max = normalize_client_channel_max(opts.fetch(:channel_max, DEFAULT_CHANNEL_MAX))
-      # will be-renegotiated during connection tuning steps. MK.
-      @channel_max        = @client_channel_max
+      @client_channel_max = opts.fetch(:channel_max, 65536)
       @client_heartbeat   = self.heartbeat_from(opts)
 
       @client_properties   = opts[:properties] || DEFAULT_CLIENT_PROPERTIES
@@ -272,8 +267,6 @@ module Bunny
     #
     # @return [Bunny::Channel] Newly opened channel
     def create_channel(n = nil, consumer_pool_size = 1)
-      raise ArgumentError, "channel number 0 is reserved in the protocol and cannot be used" if 0 == n
-
       if n && (ch = @channels[n])
         ch
       else
@@ -307,11 +300,8 @@ module Bunny
     # @return [Bunny::Session] self
     def with_channel(n = nil)
       ch = create_channel(n)
-      begin
-        yield ch
-      ensure
-        ch.close if ch.open?
-      end
+      yield ch
+      ch.close if ch.open?
 
       self
     end
@@ -657,8 +647,6 @@ module Bunny
                   UnexpectedFrame
                 when 506 then
                   ResourceError
-                when 530 then
-                  NotAllowedError
                 when 541 then
                   InternalError
                 else
@@ -950,25 +938,7 @@ module Bunny
         initialize_heartbeat_sender
       end
 
-      unless connection_open_ok.is_a?(AMQ::Protocol::Connection::OpenOk)
-        if connection_open_ok.is_a?(AMQ::Protocol::Connection::Close)
-          e = instantiate_connection_level_exception(connection_open_ok)
-          begin
-            shut_down_all_consumer_work_pools!
-            maybe_shutdown_reader_loop
-          rescue ShutdownSignal => sse
-            # no-op
-          rescue Exception => e
-            @logger.warn "Caught an exception when cleaning up after receiving connection.close: #{e.message}"
-          ensure
-            close_transport
-          end
-
-          @origin_thread.raise(e)
-        else
-          raise "could not open connection: server did not respond with connection.open-ok but #{connection_open_ok.inspect} instead"
-        end
-      end
+      raise "could not open connection: server did not respond with connection.open-ok" unless connection_open_ok.is_a?(AMQ::Protocol::Connection::OpenOk)
     end
 
     def heartbeat_disabled?(val)
@@ -988,7 +958,6 @@ module Bunny
 
     # @private
     def initialize_heartbeat_sender
-      maybe_shutdown_heartbeat_sender
       @logger.debug "Initializing heartbeat sender..."
       @heartbeat_sender = HeartbeatSender.new(@transport, @logger)
       @heartbeat_sender.start(@heartbeat)
@@ -1050,11 +1019,11 @@ module Bunny
 
     # @private
     def init_logger(level)
-      @logger          = ::Logger.new(@logfile)
-      @logger.level    = normalize_log_level(level)
-      @logger.progname = self.to_s
+      lgr          = ::Logger.new(@logfile)
+      lgr.level    = normalize_log_level(level)
+      lgr.progname = self.to_s
 
-      @logger
+      lgr
     end
 
     # @private
@@ -1069,24 +1038,6 @@ module Bunny
         Logger::WARN
       end
     end
-
-    # @private
-    def shut_down_all_consumer_work_pools!
-      @channels.each do |_, ch|
-        ch.maybe_kill_consumer_work_pool!
-      end
-    end
-
-    def normalize_client_channel_max(n)
-      return CHANNEL_MAX_LIMIT if n > CHANNEL_MAX_LIMIT
-
-      case n
-      when 0 then
-        CHANNEL_MAX_LIMIT
-      else
-        n
-      end
-    end
   end # Session
 
   # backwards compatibility

data/lib/bunny/transport.rb

@@ -368,14 +368,7 @@ module Bunny
       # setting TLS/SSL version only works correctly when done
       # vis set_params. MK.
       ctx.set_params(:ssl_version => @opts.fetch(:tls_protocol, DEFAULT_TLS_PROTOCOL))
-     
-      verify_mode = if @verify_peer
-        OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
-      else
-        OpenSSL::SSL::VERIFY_NONE
-      end
-
-      ctx.set_params(:verify_mode => verify_mode)
+      ctx.set_params(:verify_mode => OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT) if @verify_peer
 
       ctx
     end

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "1.0.7"
+  VERSION = "1.1.0.pre1"
 end

data/spec/higher_level_api/integration/channel_open_spec.rb

@@ -21,15 +21,6 @@ describe Bunny::Channel, "when opened" do
     end
   end
 
-  context "with an explicitly provided id = 0" do
-    it "raises ArgumentError" do
-      connection.should be_connected
-      expect {
-        connection.create_channel(0)
-      }.to raise_error(ArgumentError)
-    end
-  end
-
 
   context "with explicitly provided id" do
     it "uses that id and is successfully opened" do

data/spec/higher_level_api/integration/connection_spec.rb

@@ -147,25 +147,6 @@ describe Bunny::Session do
       end
     end
 
-    context "initialized with :channel_max => 4096" do
-      after :each do
-        subject.close if subject.open?
-      end
-
-      let(:channel_max) { 1024 }
-      let(:subject)     { described_class.new(:channel_max => channel_max) }
-
-      # this assumes RabbitMQ has no lower value configured. In 3.2
-      # it is 0 (no limit) by default and 1024 is still a fairly low value
-      # for future releases. MK.
-      it "negotiates channel max to be 1024" do
-        subject.start
-        subject.channel_max.should == channel_max
-
-        subject.close
-      end
-    end
-
     context "initialized with :ssl => true" do
       let(:subject) do
         described_class.new(:user     => "bunny_gem",
@@ -367,7 +348,7 @@ describe Bunny::Session do
   end
 
 
-  context "initialized with a disconnected host" do
+  context "initialized with unreachable host or port" do
     it "fails to connect" do
       lambda do
         c = described_class.new(:port => 38000)
@@ -397,4 +378,19 @@ describe Bunny::Session do
       subject.should_not be_open
     end
   end
+
+
+  context "initialized with a custom logger object" do
+    let(:io)      { StringIO.new }
+    let(:logger)  { ::Logger.new(io) }
+
+    it "uses provided logger" do
+      conn = described_class.new(:hostname => "localhost", :logger => logger)
+      conn.start
+
+      io.string.length.should > 100
+
+      conn.close
+    end
+  end
 end

data/spec/higher_level_api/integration/publisher_confirms_spec.rb

@@ -38,40 +38,4 @@ describe Bunny::Channel do
       ch.close
     end
   end
-
-
-  context "with a single-threaded connection" do
-    let(:connection) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :continuation_timeout => 10000, :threaded => false)
-      c.start
-      c
-    end
-
-
-    context "when publishing with confirms enabled" do
-      it "increments delivery index" do
-        ch = connection.create_channel
-        ch.should_not be_using_publisher_confirmations
-
-        ch.confirm_select
-        ch.should be_using_publisher_confirmations
-
-        q  = ch.queue("", :exclusive => true)
-        x  = ch.default_exchange
-
-        n.times do
-          x.publish("xyzzy", :routing_key => q.name)
-        end
-
-        ch.next_publish_seq_no.should == n + 1
-        ch.wait_for_confirms.should be_true
-        sleep 0.25
-
-        q.message_count.should == n
-        q.purge
-
-        ch.close
-      end
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0.pre1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.8.0
 description: Easy to use, feature complete Ruby client for RabbitMQ 2.0 and later
   versions.
 email:
@@ -177,7 +177,6 @@ files:
 - spec/higher_level_api/integration/tls_connection_spec.rb
 - spec/higher_level_api/integration/tx_commit_spec.rb
 - spec/higher_level_api/integration/tx_rollback_spec.rb
-- spec/higher_level_api/integration/with_channel_spec.rb
 - spec/issues/issue100_spec.rb
 - spec/issues/issue141_spec.rb
 - spec/issues/issue78_spec.rb
@@ -220,12 +219,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.1.6
 signing_key: 
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ
@@ -273,7 +272,6 @@ test_files:
 - spec/higher_level_api/integration/tls_connection_spec.rb
 - spec/higher_level_api/integration/tx_commit_spec.rb
 - spec/higher_level_api/integration/tx_rollback_spec.rb
-- spec/higher_level_api/integration/with_channel_spec.rb
 - spec/issues/issue100_spec.rb
 - spec/issues/issue141_spec.rb
 - spec/issues/issue78_spec.rb

data/spec/higher_level_api/integration/with_channel_spec.rb

@@ -1,25 +0,0 @@
-require "spec_helper"
-
-describe Bunny::Channel, "#with_channel" do
-  let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
-    c.start
-    c
-  end
-
-  after :each do
-    connection.close if connection.open?
-  end
-
-  it "closes if the block throws an exception" do
-    ch = nil
-    begin
-      connection.with_channel do |wch|
-        ch = wch
-        raise Exception.new
-      end
-    rescue Exception
-    end
-    ch.should be_closed
-  end
-end