bunny 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65fac851747ba831f48433378fbe43ddfb96c57a
-  data.tar.gz: 3065bffd94f02c19738ea1352f238c223f8f5f90
+  metadata.gz: 09f980320596ae3eead897e92cb66d74c632a257
+  data.tar.gz: 6b3b92232fdced1f96c90d452136b3f46e1f6a42
 SHA512:
-  metadata.gz: 78bc0ff879a3d2d94b1f97c55dfb1524cfed7dce6ad37d8c7a32d442de9f2b547df3c05fc243e103c01a5c50558b6fafc7a8b2f7c56c62b6f3c942e42398ad31
-  data.tar.gz: 8aff7680586499e05cadf62da282b08b6866829e468c6aee4126a0da31de6773af93ed7299f36eab2e64c6f0d417b5a0a11984419f92835df6d66aec5f704f22
+  metadata.gz: 45314827e8cb6c002b78699925f78c07e68222ad3c7d7ff3bec9ccad9160285fd9a0bbbbac820acf8b54f11ce52671578b1c8f554db27233341784c65f399100
+  data.tar.gz: 303c9cee35b6ca65a1e15ce15cbaded1b82564b9749dba146da44f02f1bed7e7bc0564754ac6e00d619e7c06307d45d85a9908ccefce34d23272a1ab3aed99bb

data/ChangeLog.md

@@ -1,3 +1,15 @@
+## Changes between Bunny 1.6.1 and 1.6.2
+
+### JRuby Writes Fixes
+
+On JRuby, Bunny reverts back to using plain old `write(2)` for writes. The CRuby implementation
+on JRuby suffers from I/O incompatibilities. Until JRuby
+
+Bunny users who run on JRuby are highly recommended to switch to [March Hare](http://rubymarchhare.info),
+which has nearly identical API and is significantly more efficient.
+
+
+
 ## Changes between Bunny 1.6.0 and 1.6.1
 
 ### Bunny::Session#with_channel Synchornisation Improvements

data/lib/bunny/transport.rb

@@ -101,28 +101,51 @@ module Bunny
       block.call(@tls_context) if @tls_context
     end
 
-    # Writes data to the socket. If read/write timeout was specified the operation will return after that
-    # amount of time has elapsed waiting for the socket.
-    #
-    # @raise [ClientTimeout]
-    def write(data)
-      return write_without_timeout(data) unless @write_timeout
-
-      begin
-        if open?
-          @writes_mutex.synchronize do
-            @socket.write_nonblock_fully(data, @write_timeout)
+    if defined?(JRUBY_VERSION)
+      # Writes data to the socket.
+      def write(data)
+        return write_without_timeout(data) unless @write_timeout
+
+        begin
+          if open?
+            @writes_mutex.synchronize do
+              @socket.write(data)
+            end
+          end
+        rescue SystemCallError, Timeout::Error, Bunny::ConnectionError, IOError => e
+          @logger.error "Got an exception when sending data: #{e.message} (#{e.class.name})"
+          close
+          @status = :not_connected
+
+          if @session.automatically_recover?
+            @session.handle_network_failure(e)
+          else
+            @session_thread.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
           end
         end
-      rescue SystemCallError, Timeout::Error, Bunny::ConnectionError, IOError => e
-        @logger.error "Got an exception when sending data: #{e.message} (#{e.class.name})"
-        close
-        @status = :not_connected
-
-        if @session.automatically_recover?
-          @session.handle_network_failure(e)
-        else
-          @session_thread.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
+      end
+    else
+      # Writes data to the socket. If read/write timeout was specified the operation will return after that
+      # amount of time has elapsed waiting for the socket.
+      def write(data)
+        return write_without_timeout(data) unless @write_timeout
+
+        begin
+          if open?
+            @writes_mutex.synchronize do
+              @socket.write_nonblock_fully(data, @write_timeout)
+            end
+          end
+        rescue SystemCallError, Timeout::Error, Bunny::ConnectionError, IOError => e
+          @logger.error "Got an exception when sending data: #{e.message} (#{e.class.name})"
+          close
+          @status = :not_connected
+
+          if @session.automatically_recover?
+            @session.handle_network_failure(e)
+          else
+            @session_thread.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
+          end
         end
       end
     end

data/lib/bunny/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol