bunny 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1dd2f949bcc12b76fad38159f60adfbf52eed85
-  data.tar.gz: 280cc9632f061268091bf5e0b705f1264f3b3aa6
+  metadata.gz: 919483301947c21f40cb3c6bdedfcc8808e365ee
+  data.tar.gz: 2b6c80010c62acd49f88abb90aad2ccd5b5baf01
 SHA512:
-  metadata.gz: 5b8e2f0e13ba6488e563ae1e8ba6566cf4c3d6ddfe22e095f3a2444240cfcf78f236cbf6a97cc71aba777e0ec8fcc14e6859fa5266dc012f063c4dbeb3bad3c0
-  data.tar.gz: 99bd85512d22d4da1626e98346a61512b470d6c87fd735838960c951af99fef340cee57cc9b8b6f54905d93f64c94c8b1a180c87b6f69439f654348aaf57e751
+  metadata.gz: ecc98a8d2591d2093b186508324331337fdb20ac061774983613278174a2c694dbf74aa2788daa7bca5356407b8891494b42523dcb2288e185e4a4465cb83378
+  data.tar.gz: 40f9b12db88c3b533a207870c2dd72b3a06da36aa71cb92dc26ced282e08df06478f163ccc2e97a6e5322c8a75c19455d286eee3a9285d7f8e4dc53e654834f2

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,18 @@
+## Does This Really Belong to GitHub issues?
+
+If you find a bug you understand well, poor default, incorrect or unclear piece of documentation,
+or missing feature, please [file an
+issue](http://github.com/ruby-amqp/bunny/issues) on GitHub.
+
+Please use [Bunny's mailing list](http://groups.google.com/group/ruby-amqp) for questions,
+investigations, and discussions. GitHub issues should be used for specific, well understood, actionable
+maintainers and contributors can work on.
+
+When filing an issue, please specify
+
+ * Which Bunny and RabbitMQ versions are used
+ * Recent RabbitMQ log file contents
+ * Full exception stack traces
+ * Steps to reproduce or a failing test case
+
+This would greatly help the maintainers help you.

data/ChangeLog.md

@@ -1,4 +1,36 @@
-## Changes between Bunny 2.7.1 and 2.7.2 (unreleased)
+## Changes between Bunny 2.7.3 and 2.7.4 (unreleased)
+
+No changes yet.
+
+
+## Changes between Bunny 2.7.2 and 2.7.3 (Dec 19th, 2017)
+
+### JRuby 9K Compatibility
+
+A JRuby 9K compatibility issue was corrected by Marian Posăceanu.
+Note that JRuby users are recommended to use [March Hare](http://rubymarchhare.info/), a JRuby-oriented client, instead
+of Bunny.
+
+GitHub issue: [#529](https://github.com/ruby-amqp/bunny/pull/529)
+
+### Connection Exceptions are Logged as Warning with Automatic Recovery
+
+When automatic recovery is enabled, connection errors are now logged as warnings
+and not errors.
+
+Contributed by Merten Falk.
+
+GitHub issue: [#531](https://github.com/ruby-amqp/bunny/pull/531)
+
+
+## Changes between Bunny 2.7.1 and 2.7.2 (Nov 4th, 2017)
+
+### Heartbeat Value Supports `:server` and `"server"`
+
+Heartbeat value of `:server` now can be specified as a string.
+
+Contributed by Tyrone.
+
 
 ### Reading a Frame without Payload Could Result in a `Bunny::NoFinalOctetError`
 

data/README.md

@@ -88,7 +88,7 @@ gem install bunny
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 2.7.0"
+gem "bunny", ">= 2.7.2"
 ```
 
 
@@ -154,8 +154,12 @@ Other documentation guides are available at [rubybunny.info](http://rubybunny.in
 
 ### Mailing List
 
-[Bunny has a mailing list](http://groups.google.com/group/ruby-amqp). We encourage you
-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.
+[Bunny has a mailing list](http://groups.google.com/group/ruby-amqp). Please use it for all questions,
+investigations, and discussions. GitHub issues should be used for specific, well understood, actionable
+maintainers and contributors can work on.
+
+We encourage you 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.
 
 
 ## Continuous Integration
@@ -172,13 +176,17 @@ More detailed announcements can be found in the [RabbitMQ Ruby clients blog](htt
 
 ### Reporting Issues
 
-If you find a bug, poor default, missing feature or find any part of
-the API inconvenient, please [file an
-issue](http://github.com/ruby-amqp/bunny/issues) on GitHub.  When
-filing an issue, please specify which Bunny and RabbitMQ versions you
-are using, provide recent RabbitMQ log file contents if possible, and
-try to explain what behavior you expected and why. Bonus points for
-contributing failing test cases.
+If you find a bug you understand well, poor default, incorrect or unclear piece of documentation,
+or missing feature, please [file an
+issue](http://github.com/ruby-amqp/bunny/issues) on GitHub.
+
+Please use [Bunny's mailing list](http://groups.google.com/group/ruby-amqp) for questions,
+investigations, and discussions. GitHub issues should be used for specific, well understood, actionable
+maintainers and contributors can work on.
+
+When filing an issue, please specify which Bunny and RabbitMQ versions you
+are using, provide recent RabbitMQ log file contents, full exception stack traces,
+and steps to reproduce (or failing test cases).
 
 
 ## Other Ruby RabbitMQ Clients

data/lib/bunny/jruby/socket.rb

@@ -8,6 +8,20 @@ module Bunny
     module Socket
       include Bunny::Socket
 
+      def self.open(host, port, options = {})
+        socket = ::Socket.tcp(host, port, nil, nil,
+                              connect_timeout: options[:connect_timeout])
+        if ::Socket.constants.include?('TCP_NODELAY') || ::Socket.constants.include?(:TCP_NODELAY)
+          socket.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, true)
+        end
+        socket.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_KEEPALIVE, true) if options.fetch(:keepalive, true)
+        socket.extend self
+        socket.options = { :host => host, :port => port }.merge(options)
+        socket
+      rescue Errno::ETIMEDOUT
+        raise ClientTimeout
+      end
+
       # Reads given number of bytes with an optional timeout
       #
       # @param [Integer] count How many bytes to read
@@ -16,17 +30,17 @@ module Bunny
       # @return [String] Data read from the socket
       # @api public
       def read_fully(count, timeout = nil)
-        return nil if @__bunny_socket_eof_flag__
-
         value = ''
+
         begin
           loop do
-            value << readpartial(count - value.bytesize)
+            value << read_nonblock(count - value.bytesize)
             break if value.bytesize >= count
           end
         rescue EOFError
-          # @eof will break Rubinius' TCPSocket implementation. MK.
-          @__bunny_socket_eof_flag__ = true
+          # JRuby specific fix via https://github.com/jruby/jruby/issues/1694#issuecomment-54873532
+          IO.select([self], nil, nil, timeout)
+          retry
         rescue *READ_RETRY_EXCEPTION_CLASSES
           if IO.select([self], nil, nil, timeout)
             retry
@@ -34,8 +48,10 @@ module Bunny
             raise Timeout::Error, "IO timeout when reading #{count} bytes"
           end
         end
+
         value
       end # read_fully
+
     end
   end
 end

data/lib/bunny/reader_loop.rb

@@ -36,11 +36,12 @@ module Bunny
         rescue AMQ::Protocol::EmptyResponseError, IOError, SystemCallError, Timeout::Error => e
           break if terminate? || @session.closing? || @session.closed?
 
-          log_exception(e)
           @network_is_down = true
           if @session.automatically_recover?
+            log_exception(e, level: :warn)
             @session.handle_network_failure(e)
           else
+            log_exception(e)
             @session_thread.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
           end
         rescue ShutdownSignal => _
@@ -122,12 +123,12 @@ module Bunny
 
     protected
 
-    def log_exception(e)
+    def log_exception(e, level: :error)
       if !(io_error?(e) && (@session.closing? || @session.closed?))
-        @logger.error "Exception in the reader loop: #{e.class.name}: #{e.message}"
-        @logger.error "Backtrace: "
+        @logger.send level, "Exception in the reader loop: #{e.class.name}: #{e.message}"
+        @logger.send level, "Backtrace: "
         e.backtrace.each do |line|
-          @logger.error "\t#{line}"
+          @logger.send level, "\t#{line}"
         end
       end
     end

data/lib/bunny/session.rb

@@ -191,7 +191,7 @@ module Bunny
 
       client_props         = opts[:properties] || opts[:client_properties] || {}
       @client_properties   = DEFAULT_CLIENT_PROPERTIES.merge(client_props)
-      @mechanism           = opts.fetch(:auth_mechanism, "PLAIN")
+      @mechanism           = normalize_auth_mechanism(opts.fetch(:auth_mechanism, "PLAIN"))
       @credentials_encoder = credentials_encoder_for(@mechanism)
       @locale              = @opts.fetch(:locale, DEFAULT_LOCALE)
 
@@ -1383,6 +1383,7 @@ module Bunny
     end
 
     def normalize_client_channel_max(n)
+      return CHANNEL_MAX_LIMIT if n.nil?
       return CHANNEL_MAX_LIMIT if n > CHANNEL_MAX_LIMIT
 
       case n
@@ -1393,6 +1394,17 @@ module Bunny
       end
     end
 
+    def normalize_auth_mechanism(value)
+      case value
+      when [] then
+        "PLAIN"
+      when nil then
+        "PLAIN"
+      else
+        value
+      end
+    end
+
     def ignoring_io_errors(&block)
       begin
         block.call

data/lib/bunny/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -37,6 +37,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"