bunny 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65bba4f160af1169e1e2d7f1e15045dad3fafb21
-  data.tar.gz: 38db4dd54e20cd407012b4e81da4a537585fe7db
+  metadata.gz: c8837b72e1a3b2ce162fc168eb298bcc9089f1d1
+  data.tar.gz: 22a780ffdeff22a180470071ab8c90da2ef0ed81
 SHA512:
-  metadata.gz: 180fcfdee5da277fb7d4e7d1249cfd0dda89f62539f3da1c669591468fc1b3a93d69e66334756aa151187ee799401b57648a04e99f0addaafc06f3409f7ac6ad
-  data.tar.gz: 56906a33ce0109360cb65cfce44aed78bb0ae7c100369e4bda8f7531aa4153ba69fda011b8d4b699718b5590ab8460f46ae5355ee4fec5cb33f6c5ef63771d5c
+  metadata.gz: 35bb0e4f3cc1dbd35d1fe9e135059b695f2fde65f188265a685d35c11ecad0460409215235ff3b108474e0a6304cca1f00a43d477ca129f4c1f3ea0d50615e33
+  data.tar.gz: aa3ee730eb9f096e0f9268e3187741752f80877a5bea078039133ae830a83e177c435120f369953b122bb8c6bdb7250cf81a167675f1b6d8e22b1e74c9e0b466

data/ChangeLog.md

@@ -1,3 +1,47 @@
+## 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'
+```
+
+### 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

data/bunny.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     map { |mail| Base64.decode64(mail) }
 
   # Dependencies
-  s.add_dependency "amq-protocol", ">= 1.8.0"
+  s.add_dependency "amq-protocol", ">= 1.9.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.event_loop.run_once until @basic_get_continuations.length > 0
+        connection.reader_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.event_loop.run_once until @confirms_continuations.length > 0
+        connection.reader_loop.run_once until @confirms_continuations.length > 0
 
         @confirms_continuations.pop
       end

data/lib/bunny/exceptions.rb

@@ -42,6 +42,18 @@ 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,6 +36,10 @@ 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
@@ -78,7 +82,7 @@ module Bunny
 
     # @return [Bunny::Transport]
     attr_reader :transport
-    attr_reader :status, :host, :port, :heartbeat, :user, :pass, :vhost, :frame_max, :threaded
+    attr_reader :status, :host, :port, :heartbeat, :user, :pass, :vhost, :frame_max, :channel_max, :threaded
     attr_reader :server_capabilities, :server_properties, :server_authentication_mechanisms, :server_locales
     attr_reader :default_channel
     attr_reader :channel_id_allocator
@@ -149,7 +153,9 @@ 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 = opts.fetch(:channel_max, 65536)
+      @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_heartbeat   = self.heartbeat_from(opts)
 
       @client_properties   = opts[:properties] || DEFAULT_CLIENT_PROPERTIES
@@ -646,6 +652,8 @@ module Bunny
                   UnexpectedFrame
                 when 506 then
                   ResourceError
+                when 530 then
+                  NotAllowedError
                 when 541 then
                   InternalError
                 else
@@ -937,7 +945,25 @@ module Bunny
         initialize_heartbeat_sender
       end
 
-      raise "could not open connection: server did not respond with connection.open-ok" unless connection_open_ok.is_a?(AMQ::Protocol::Connection::OpenOk)
+      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
     end
 
     def heartbeat_disabled?(val)
@@ -957,6 +983,7 @@ 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)
@@ -1037,6 +1064,24 @@ 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/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/higher_level_api/integration/connection_spec.rb

@@ -147,6 +147,25 @@ 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",

data/spec/higher_level_api/integration/publisher_confirms_spec.rb

@@ -38,4 +38,40 @@ 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.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-26 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.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 description: Easy to use, feature complete Ruby client for RabbitMQ 2.0 and later
   versions.
 email:
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ