bunny 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cee8bb663b9c828e0e82293ad144c29119114e94
-  data.tar.gz: f1186b143dde46b7a64ca23dfe664ca2daf04d09
+  metadata.gz: e10debc2fea6cb3ed014eeebdef45e41e7dad3b4
+  data.tar.gz: 12d0bb9c3a0878b4831c2fe448fe09a0a0207c6d
 SHA512:
-  metadata.gz: 6ef4487153f5b27349a6a93bf3248acbf3da3bbe8359ae786542fced024227bec545b23323cc939ec85e43da934891d98a50657b479ecd837b97062800c21cd1
-  data.tar.gz: 36698772a5428eb1c3ff7c5ce877c95529e93aaf207eab6afa8e068f161e9824841c852fbe9751a485d34bdc9e7b1d7d4b4e5d83eb59788c9e4544a06a480f03
+  metadata.gz: ac653c25bc8bd4b8da57e68e0f077f2466eb374da3427f24a9ce62d87cd980246d1785728cf55969d90806bee886390f4ec625732a65903722704d8faa0308f3
+  data.tar.gz: b7d5b2b007e2f1a13240f44df4bcb302155f4d4333950d73ec38e492f3526e971fc2094963489c68af0f13664c906c00eb793dc195ded4d3f829ba7e4d0bd550

data/.travis.yml

@@ -1,13 +1,11 @@
 language: ruby
 bundler_args: --without development
+cache: bundler
 before_script: "./bin/ci/before_build"
 script: "bundle exec rspec -cf documentation spec"
 rvm:
-  - "2.2"
-  - "2.1"
-  - "2.0"
-  - "jruby"
-  - "rbx"
+  - "2.3.0"
+  - "2.2.2"
 notifications:
   email: michael@rabbitmq.com
 services:
@@ -15,8 +13,3 @@ services:
 branches:
   only:
     - master
-    - 1.4.x-stable
-matrix:
-  allow_failures:
-    - rvm: rbx
-    - rvm: jruby

data/ChangeLog.md

@@ -1,12 +1,21 @@
-## Changes between Bunny 2.2.1 and 2.2.2
+## Changes between Bunny 2.2.0 and 2.3.0 (Feb 26th, 2016)
 
-### amq-protocol Update
+### Thread#abort_on_exception Setting for Consumer Work Pool Threads
+
+`Bunny::Session#create_channel` now supports a 3rd argument that,
+when set to `true`, makes consumer work pool threads to have
+`Thread#abort_on_exception` set on them.
+
+Contributed by Seamus Abshere.
 
-Minimum `amq-protocol` version is now `2.0.1` which includes
-bug fixes.
+### Explicit Transport Closure on Recovery
 
+Bunny now will explicitly close previosly used transport before starting
+connection recovery.
 
-## Changes between Bunny 2.2.0 and 2.2.1
+GitHub issue: [#377](https://github.com/ruby-amqp/bunny/pull/377).
+
+Contributed by bkanhoopla.
 
 ### No TLS Socket Double-init
 
@@ -16,9 +25,15 @@ GH issue: [#345](https://github.com/ruby-amqp/bunny/issues/345).
 
 Contributed by Carl Hörberg.
 
+### Lazily Evaluated Debug Log Strings
+
+GH issue: [#375](https://github.com/ruby-amqp/bunny/pull/375)
+
+Contributed by Omer Katz.
 
 
-## Changes between Bunny 2.1.0 and 2.2.0
+
+## Changes between Bunny 2.1.0 and 2.2.0 (Sep 6th, 2015)
 
 ### Add :addresses to connect options
 
@@ -26,6 +41,8 @@ Before this the connection options only allowed multiple hosts, an
 address is a combination of a host and a port. This makes it possible to
 specify different hosts with different ports.
 
+Contributed by Bart van Zon (Tele2).
+
 ### Recover from connection.close by default
 
 Bunny will now try to reconnect also when server sent connection.close is
@@ -33,6 +50,9 @@ received, e.g. when a server is restarting (but also when the connection is
 force closed by the server). This is in-line with how many other clients behave.
 The old default was `recover_from_connection_close: false`.
 
+Contributed by Carl Hörberg (CloudAMQP).
+
+
 ## Changes between Bunny 2.0.0 and 2.1.0
 
 Bunny 2.1.0 has an **important breaking change**. It is highly

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 – 2015 Chris Duncan, Jakub Stastny aka botanicus,
+Copyright (c) 2009 – 2016 Chris Duncan, Jakub Stastny aka botanicus,
 Michael S. Klishin, Eric Lindvall, Stefan Kaes and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.md

@@ -51,7 +51,7 @@ Modern Bunny versions support
  * CRuby 2.2, 2.1, 2.0
 
 Bunny works sufficiently well on JRuby but there are known
-JRuby bugs that cause high CPU burn. JRuby users should
+JRuby bugs in versions prior to JRuby 9000 that cause high CPU burn. JRuby users should
 use [March Hare](http://rubymarchhare.info).
 
 Bunny `1.7.x` was the last version to support CRuby 1.9.3 and 1.8.7
@@ -88,7 +88,7 @@ gem install bunny
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 2.1.0"
+gem "bunny", ">= 2.2.2"
 ```
 
 
@@ -158,9 +158,9 @@ Other documentation guides are available at [rubybunny.info](http://rubybunny.in
 to also join the [RabbitMQ mailing list](https://groups.google.com/forum/#!forum/rabbitmq-users) mailing list. Feel free to ask any questions that you may have.
 
 
-### IRC
+## Continuous Integration
 
-For more immediate help, please join `#rabbitmq` on `irc.freenode.net`.
+[![Build Status](https://travis-ci.org/ruby-amqp/bunny.png)](https://travis-ci.org/ruby-amqp/bunny/)
 
 
 ### News & Announcements on Twitter

data/examples/connection/channel_level_exception.rb

@@ -11,14 +11,6 @@ require 'bunny'
 conn = Bunny.new(:heartbeat_interval => 8)
 conn.start
 
-begin
-  ch1 = conn.create_channel
-  ch1.queue_delete("queue_that_should_not_exist#{rand}")
-rescue Bunny::NotFound => e
-  puts "Channel-level exception! Code: #{e.channel_close.reply_code}, message: #{e.channel_close.reply_text}"
-end
-
-
 begin
   ch2 = conn.create_channel
   q   = "bunny.examples.recovery.q#{rand}"

data/examples/guides/extensions/alternate_exchange.rb

@@ -4,6 +4,8 @@
 require "rubygems"
 require "bunny"
 
+STDOUT.sync = true
+
 puts "=> Demonstrating alternate exchanges"
 puts
 

data/examples/guides/getting_started/hello_world.rb

@@ -4,6 +4,8 @@
 require "rubygems"
 require "bunny"
 
+STDOUT.sync = true
+
 conn = Bunny.new
 conn.start
 

data/examples/guides/getting_started/weathr.rb

@@ -4,6 +4,8 @@
 require "rubygems"
 require "bunny"
 
+STDOUT.sync = true
+
 connection = Bunny.new
 connection.start
 

data/examples/guides/queues/one_off_consumer.rb

@@ -4,6 +4,8 @@
 require "rubygems"
 require "bunny"
 
+STDOUT.sync = true
+
 conn = Bunny.new
 conn.start
 

data/examples/guides/queues/redeliveries.rb

@@ -4,6 +4,8 @@
 require "rubygems"
 require "bunny"
 
+STDOUT.sync = true
+
 puts "=> Subscribing for messages using explicit acknowledgements model"
 puts
 

data/lib/bunny/channel.rb

@@ -618,14 +618,14 @@ module Bunny
       # implementation (and even more correct and convenient ones, such as wait/notify, should
       # we implement them). So we return a triple of nils immediately which apps should be
       # able to handle anyway as "got no message, no need to act". MK.
-      @last_basic_get_response = if @connection.open?
-                                   wait_on_basic_get_continuations
-                                 else
-                                   [nil, nil, nil]
-                                 end
+      last_basic_get_response = if @connection.open?
+                                  wait_on_basic_get_continuations
+                                else
+                                  [nil, nil, nil]
+                                end
 
       raise_if_continuation_resulted_in_a_channel_error!
-      @last_basic_get_response
+      last_basic_get_response
     end
 
     # prefetch_count is of type short in the protocol. MK.
@@ -705,7 +705,7 @@ module Bunny
     #
     #   ch    = conn.create_channel
     #   q.subscribe do |delivery_info, properties, payload|
-    #     # requeue the message
+    #     # reject the message
     #     ch.basic_reject(delivery_info.delivery_tag, false)
     #   end
     #
@@ -1488,7 +1488,7 @@ module Bunny
     #
     # @api plugin
     def recover_from_network_failure
-      @logger.debug "Recovering channel #{@id} after network failure"
+      @logger.debug { "Recovering channel #{@id} after network failure" }
       release_all_continuations
 
       recover_prefetch_setting
@@ -1544,7 +1544,7 @@ module Bunny
     # @api plugin
     def recover_queues
       @queues.values.dup.each do |q|
-        @logger.debug "Recovering queue #{q.name}"
+        @logger.debug { "Recovering queue #{q.name}" }
         q.recover_from_network_failure
       end
     end
@@ -1555,7 +1555,7 @@ module Bunny
     # @api plugin
     def recover_consumers
       unless @consumers.empty?
-        @work_pool = ConsumerWorkPool.new(@work_pool.size)
+        @work_pool = ConsumerWorkPool.new(@work_pool.size, @work_pool.abort_on_exception)
         @work_pool.start
       end
       @consumers.values.dup.each do |c|
@@ -1616,7 +1616,7 @@ module Bunny
 
     # @private
     def handle_method(method)
-      @logger.debug "Channel#handle_frame on channel #{@id}: #{method.inspect}"
+      @logger.debug { "Channel#handle_frame on channel #{@id}: #{method.inspect}" }
       case method
       when AMQ::Protocol::Queue::DeclareOk then
         @continuations.push(method)

data/lib/bunny/consumer_work_pool.rb

@@ -15,9 +15,11 @@ module Bunny
 
     attr_reader :threads
     attr_reader :size
+    attr_reader :abort_on_exception
 
-    def initialize(size = 1)
+    def initialize(size = 1, abort_on_exception = false)
       @size  = size
+      @abort_on_exception = abort_on_exception
       @queue = ::Queue.new
       @paused = false
     end
@@ -32,6 +34,7 @@ module Bunny
 
       @size.times do
         t = Thread.new(&method(:run_loop))
+        t.abort_on_exception = true if abort_on_exception
         @threads << t
       end
 

data/lib/bunny/exceptions.rb

@@ -69,7 +69,7 @@ module Bunny
       m = case e
           when String then
             e
-          when Exception then
+          when ::Exception then
             e.message
           end
       if hostname && port

data/lib/bunny/heartbeat_sender.rb

@@ -62,7 +62,7 @@ module Bunny
       now = Time.now
 
       if now > (@last_activity_time + @interval)
-        @logger.debug "Sending a heartbeat, last activity time: #{@last_activity_time}, interval (s): #{@interval}"
+        @logger.debug { "Sending a heartbeat, last activity time: #{@last_activity_time}, interval (s): #{@interval}" }
         @transport.write_without_timeout(AMQ::Protocol::HeartbeatFrame.encode)
       end
     end

data/lib/bunny/session.rb

@@ -86,8 +86,9 @@ module Bunny
     attr_reader :mechanism
     # @return [Logger]
     attr_reader :logger
-    # @return [Integer] Timeout for blocking protocol operations (queue.declare, queue.bind, etc), in milliseconds. Default is 4000.
+    # @return [Integer] Timeout for blocking protocol operations (queue.declare, queue.bind, etc), in milliseconds. Default is 15000.
     attr_reader :continuation_timeout
+    attr_reader :network_recovery_interval
 
 
     # @param [String, Hash] connection_string_or_opts Connection string or a hash of connection options
@@ -107,7 +108,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 [String] :verify_peer (true) Whether TLS peer verification should be performed
-    # @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] :continuation_timeout (15000) 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 connection_string_or_opts [Proc] :hosts_shuffle_strategy A Proc that reorders a list of host strings, defaults to Array#shuffle
     # @option connection_string_or_opts [Logger] :logger The logger.  If missing, one is created using :log_file and :log_level.
@@ -330,14 +331,14 @@ module Bunny
     # opened (this operation is very fast and inexpensive).
     #
     # @return [Bunny::Channel] Newly opened channel
-    def create_channel(n = nil, consumer_pool_size = 1)
+    def create_channel(n = nil, consumer_pool_size = 1, consumer_pool_abort_on_exception = false)
       raise ArgumentError, "channel number 0 is reserved in the protocol and cannot be used" if 0 == n
 
       @channel_mutex.synchronize do
         if n && (ch = @channels[n])
           ch
         else
-          ch = Bunny::Channel.new(self, n, ConsumerWorkPool.new(consumer_pool_size || 1))
+          ch = Bunny::Channel.new(self, n, ConsumerWorkPool.new(consumer_pool_size || 1, consumer_pool_abort_on_exception))
           ch.open
           ch
         end
@@ -547,7 +548,7 @@ module Bunny
     #
     # @private
     def handle_frame(ch_number, method)
-      @logger.debug "Session#handle_frame on #{ch_number}: #{method.inspect}"
+      @logger.debug { "Session#handle_frame on #{ch_number}: #{method.inspect}" }
       case method
       when AMQ::Protocol::Channel::OpenOk then
         @continuations.push(method)
@@ -636,6 +637,7 @@ module Bunny
             @channels.each do |n, ch|
               ch.maybe_kill_consumer_work_pool!
             end
+            @reader_loop.stop if @reader_loop
             maybe_shutdown_heartbeat_sender
 
             recover_from_network_failure
@@ -695,9 +697,6 @@ module Bunny
 
     # @private
     def recover_channels
-      # default channel is reopened right after connection
-      # negotiation is completed, so make sure we do not try to open
-      # it twice. MK.
       @channels.each do |n, ch|
         ch.open
 
@@ -934,7 +933,7 @@ module Bunny
       end
     end
 
-    # Sends multiple frames, one by one. For thread safety this method takes a channel
+    # Sends multiple frames, in one go. For thread safety this method takes a channel
     # object and synchronizes on it.
     #
     # @private
@@ -1049,7 +1048,7 @@ module Bunny
                               else
                                 negotiate_value(@client_heartbeat, connection_tune.heartbeat)
                               end
-      @logger.debug "Heartbeat interval negotiation: client = #{@client_heartbeat}, server = #{connection_tune.heartbeat}, result = #{@heartbeat}"
+      @logger.debug { "Heartbeat interval negotiation: client = #{@client_heartbeat}, server = #{connection_tune.heartbeat}, result = #{@heartbeat}" }
       @logger.info "Heartbeat interval used (in seconds): #{@heartbeat}"
 
       # We set the read_write_timeout to twice the heartbeat value
@@ -1069,9 +1068,9 @@ module Bunny
       end
 
       @transport.send_frame(AMQ::Protocol::Connection::TuneOk.encode(@channel_max, @frame_max, @heartbeat))
-      @logger.debug "Sent connection.tune-ok with heartbeat interval = #{@heartbeat}, frame_max = #{@frame_max}, channel_max = #{@channel_max}"
+      @logger.debug { "Sent connection.tune-ok with heartbeat interval = #{@heartbeat}, frame_max = #{@frame_max}, channel_max = #{@channel_max}" }
       @transport.send_frame(AMQ::Protocol::Connection::Open.encode(self.vhost))
-      @logger.debug "Sent connection.open with vhost = #{self.vhost}"
+      @logger.debug { "Sent connection.open with vhost = #{self.vhost}" }
 
       frame2 = begin
                  fr = @transport.read_next_frame

data/lib/bunny/transport.rb

@@ -458,8 +458,8 @@ but prone man-in-the-middle attacks. Please set :verify_peer => true in producti
           cert_inlines.push(cert)
         end
       end
-      @logger.debug "Using CA certificates at #{cert_files.join(', ')}"
-      @logger.debug "Using #{cert_inlines.count} inline CA certificates"
+      @logger.debug { "Using CA certificates at #{cert_files.join(', ')}" }
+      @logger.debug { "Using #{cert_inlines.count} inline CA certificates" }
       if certs.empty?
         @logger.error "No CA certificates found, add one with :tls_ca_certificates"
       end

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/basic_consume_spec.rb

@@ -260,7 +260,10 @@ describe Bunny::Queue, "#subscribe" do
       let(:queue_name) { "bunny.basic_consume#{rand}" }
 
       it "uses exception handler" do
+        caughts = []
         t = Thread.new do
+          allow(connection.logger).to receive(:error) { |x| caughts << x }
+
           ch = connection.create_channel
           q  = ch.queue(queue_name, :auto_delete => true, :durable => false)
 
@@ -276,6 +279,8 @@ describe Bunny::Queue, "#subscribe" do
         5.times { x.publish("hello", :routing_key => queue_name) }
         sleep 1.5
 
+        expect(caughts.size).to eq(5)
+
         ch.close
       end
     end

data/spec/higher_level_api/integration/connection_recovery_spec.rb

@@ -359,6 +359,7 @@ unless ENV["CI"]
         expect(c).not_to be_open
 
         wait_for_recovery
+        sleep 1
         expect(ch).to be_open
 
         expect(q.consumer_count).to eq n
@@ -381,6 +382,7 @@ unless ENV["CI"]
         expect(c).not_to be_open
 
         wait_for_recovery
+        sleep 1
         expect(ch).to be_open
 
         qs.each do |q|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ