bunny 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e5fc526781ca58758094abdb97f80c73dbbd895
-  data.tar.gz: 776c3e93dd301774054da7ac4a99969559a4efdc
+  metadata.gz: deafec372105c91a09a6d8b591586e30e4249130
+  data.tar.gz: a1cd14563b4cae9f215b0e0281ef593e671c874c
 SHA512:
-  metadata.gz: 207adf5c0274c4277ab0c5a685188392d7f436b89bdec8101e98be513947ec44b8f560c8a0a190aad99de0787c5386b2757cc097f6de1453f41cdb9306f5ce77
-  data.tar.gz: 4c20d9682bd762032fd3ca4b975b2c64096166c1b4ed863a364d41648a94b52d59332f016d96ab3e0e3aeb93b210ce403e7196e9348b25f59ed29b64697a074a
+  metadata.gz: 1c6aeff5a3446e1e183ea85eb665d710a583c69c9f0c63bb6eb0fd88799efc996d106cf594bd7daec645bc81c29f2f2fe7ac7c5788399d8191969813d2a52595
+  data.tar.gz: d951ff5afc82912a0aecf6076d8268c1ff14ec7e9a6ecc08cb0d40e5726edffcc7326a7fe73cc56c12b6169dedb9184cd0c2345d5ce823cd7879cb6cfa90488a

data/ChangeLog.md

@@ -1,3 +1,21 @@
+## Changes between Bunny 0.9.1 and 0.9.2
+
+### Reliability Improvement in Automatic Network Failure Recovery
+
+Bunny now ensures a new connection transport (socket) is initialized
+before any recovery is attempted.
+
+
+
+## Changes between Bunny 0.9.0 and 0.9.1
+
+### Reliability Improvement in Bunny::Session#create_channel
+
+`Bunny::Session#create_channel` now uses two separate mutexes to avoid
+a (very rare) issue when the previous implementation would try to
+re-acquire the same mutex and fail (Ruby mutexes are non-reentrant).
+
+
 ## Changes between Bunny 0.9.0.rc1 and 0.9.0.rc2
 
 ### Channel Now Properly Restarts Consumer Pool

data/lib/bunny/session.rb

@@ -151,8 +151,9 @@ module Bunny
       @transport_mutex     = Mutex.new
       @channels            = Hash.new
 
-      self.reset_continuations
+      @origin_thread       = Thread.current
 
+      self.reset_continuations
       self.initialize_transport
     end
 
@@ -485,7 +486,8 @@ module Bunny
       begin
         sleep @network_recovery_interval
         @logger.debug "About to start connection recovery..."
-        start
+        self.initialize_transport
+        self.start
 
         if open?
           @recovering_from_network_failure = false
@@ -796,7 +798,7 @@ module Bunny
 
     # @private
     def initialize_transport
-      @transport = Transport.new(self, @host, @port, @opts.merge(:session_thread => Thread.current))
+      @transport = Transport.new(self, @host, @port, @opts.merge(:session_thread => @origin_thread))
     end
 
     # @private

data/lib/bunny/transport.rb

@@ -33,6 +33,7 @@ module Bunny
       @port    = port
       @opts    = opts
 
+      @logger                = session.logger
       @tls_enabled           = tls_enabled?(opts)
       @tls_certificate_path  = tls_certificate_path_from(opts)
       @tls_key_path          = tls_key_path_from(opts)
@@ -115,6 +116,7 @@ module Bunny
           end
         end
       rescue SystemCallError, Bunny::ClientTimeout, Bunny::ConnectionError, IOError => e
+        @logger.error "Got an exception when sending data: #{e.message} (#{e.class.name})"
         close
         @status = :not_connected
 

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/basic_cancel_spec.rb

@@ -61,10 +61,10 @@ describe Bunny::Consumer, "#cancel" do
         q.subscribe_with(consumer, :block => false)
       end
       t.abort_on_exception = true
-      sleep 0.5
+      sleep 1.0
 
       consumer.cancel
-      sleep 0.5
+      sleep 1.0
 
       ch = connection.create_channel
       ch.default_exchange.publish("", :routing_key => queue_name)

data/spec/higher_level_api/integration/connection_spec.rb

@@ -54,115 +54,108 @@ describe Bunny::Session do
 
 
   context "initialized with all defaults" do
-    after :each do
-      subject.close if subject.open?
-    end
-
-    subject do
-      Bunny.new
-    end
-
     it "provides a way to fine tune socket options" do
-      subject.start
-      subject.transport.socket.should respond_to(:setsockopt)
+      conn = Bunny.new
+      conn.start
+      conn.transport.socket.should respond_to(:setsockopt)
+
+      conn.close
     end
 
     it "successfully negotiates the connection" do
-      subject.start
-      subject.should be_connected
+      conn = Bunny.new
+      conn.start
+      conn.should be_connected
 
-      subject.server_properties.should_not be_nil
-      subject.server_capabilities.should_not be_nil
+      conn.server_properties.should_not be_nil
+      conn.server_capabilities.should_not be_nil
 
-      props = subject.server_properties
+      props = conn.server_properties
 
       props["product"].should_not be_nil
       props["platform"].should_not be_nil
       props["version"].should_not be_nil
-    end
-  end
 
-  context "initialized with TCP connection timeout = 5" do
-    after :each do
-      subject.close if subject.open?
+      conn.close
     end
+  end
 
-    subject do
-      described_class.new(:connection_timeout => 5)
-    end
+  unless ENV["CI"]
+    context "initialized with TCP connection timeout = 5" do
+      it "successfully connects" do
+        conn = described_class.new(:connection_timeout => 5)
+        conn.start
+        conn.should be_connected
 
-    it "successfully connects" do
-      subject.start
-      subject.should be_connected
+        conn.server_properties.should_not be_nil
+        conn.server_capabilities.should_not be_nil
 
-      subject.server_properties.should_not be_nil
-      subject.server_capabilities.should_not be_nil
+        props = conn.server_properties
 
-      props = subject.server_properties
+        props["product"].should_not be_nil
+        props["platform"].should_not be_nil
+        props["version"].should_not be_nil
 
-      props["product"].should_not be_nil
-      props["platform"].should_not be_nil
-      props["version"].should_not be_nil
+        conn.close
+      end
     end
-  end
 
-  context "initialized with :host => 127.0.0.1" do
-    after :each do
-      subject.close if subject.open?
-    end
+    context "initialized with :host => 127.0.0.1" do
+      after :each do
+        subject.close if subject.open?
+      end
 
-    let(:host)  { "127.0.0.1" }
-    subject do
-      described_class.new(:host => host)
-    end
+      let(:host)  { "127.0.0.1" }
+      subject do
+        described_class.new(:host => host)
+      end
 
-    it "uses hostname = 127.0.0.1" do
-      subject.host.should == host
-      subject.hostname.should == host
-    end
+      it "uses hostname = 127.0.0.1" do
+        subject.host.should == host
+        subject.hostname.should == host
+      end
 
-    it "uses port 5672" do
-      subject.port.should == port
-    end
+      it "uses port 5672" do
+        subject.port.should == port
+      end
 
-    it "uses username = guest" do
-      subject.username.should == username
+      it "uses username = guest" do
+        subject.username.should == username
+      end
     end
-  end
 
-  context "initialized with :hostname => localhost" do
-    after :each do
-      subject.close if subject.open?
-    end
+    context "initialized with :hostname => localhost" do
+      after :each do
+        subject.close if subject.open?
+      end
 
-    let(:host)    { "localhost" }
-    let(:subject) { described_class.new(:hostname => host) }
+      let(:host)    { "localhost" }
+      let(:subject) { described_class.new(:hostname => host) }
 
-    it "uses hostname = localhost" do
-      subject.host.should == host
-      subject.hostname.should == host
-    end
+      it "uses hostname = localhost" do
+        subject.host.should == host
+        subject.hostname.should == host
+      end
 
-    it "uses port 5672" do
-      subject.port.should == port
-    end
+      it "uses port 5672" do
+        subject.port.should == port
+      end
 
-    it "uses username = guest" do
-      subject.username.should == username
-      subject.user.should == username
+      it "uses username = guest" do
+        subject.username.should == username
+        subject.user.should == username
+      end
     end
-  end
 
-  unless ENV["CI"]
     context "initialized with :ssl => true" do
       let(:subject) do
         described_class.new(:user     => "bunny_gem",
-                            :password => "bunny_password",
-                            :vhost    => "bunny_testbed",
-                            :ssl                   => true,
-                            :ssl_cert              => "spec/tls/client_cert.pem",
-                            :ssl_key               => "spec/tls/client_key.pem",
-                            :ssl_ca_certificates   => ["./spec/tls/cacert.pem"])
+          :password => "bunny_password",
+          :vhost    => "bunny_testbed",
+          :ssl                   => true,
+          :ssl_cert              => "spec/tls/client_cert.pem",
+          :ssl_key               => "spec/tls/client_key.pem",
+          :ssl_ca_certificates   => ["./spec/tls/cacert.pem"])
       end
 
       it "uses TLS port" do
@@ -173,12 +166,12 @@ describe Bunny::Session do
     context "initialized with :tls => true" do
       let(:subject) do
         described_class.new(:user     => "bunny_gem",
-                            :password => "bunny_password",
-                            :vhost    => "bunny_testbed",
-                            :tls                   => true,
-                            :tls_cert              => "spec/tls/client_cert.pem",
-                            :tls_key               => "spec/tls/client_key.pem",
-                            :tls_ca_certificates   => ["./spec/tls/cacert.pem"])
+          :password => "bunny_password",
+          :vhost    => "bunny_testbed",
+          :tls                   => true,
+          :tls_cert              => "spec/tls/client_cert.pem",
+          :tls_key               => "spec/tls/client_key.pem",
+          :tls_ca_certificates   => ["./spec/tls/cacert.pem"])
       end
 
       it "uses TLS port" do

data/spec/higher_level_api/integration/publisher_confirms_spec.rb

@@ -7,10 +7,11 @@ describe Bunny::Channel do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 
+  let(:n) { 200 }
 
   context "when publishing with confirms enabled" do
     it "increments delivery index" do
@@ -23,15 +24,15 @@ describe Bunny::Channel do
       q  = ch.queue("", :exclusive => true)
       x  = ch.default_exchange
 
-      500.times do
+      n.times do
         x.publish("xyzzy", :routing_key => q.name)
       end
 
-      ch.next_publish_seq_no.should == 501
+      ch.next_publish_seq_no.should == n + 1
       ch.wait_for_confirms.should be_true
       sleep 0.25
 
-      q.message_count.should == 500
+      q.message_count.should == n
       q.purge
 
       ch.close

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -181,7 +181,6 @@ files:
 - spec/unit/bunny_spec.rb
 - spec/unit/concurrent/condition_spec.rb
 - spec/unit/concurrent/linked_continuation_queue_spec.rb
-- spec/unit/transport_spec.rb
 homepage: http://rubybunny.info
 licenses:
 - MIT
@@ -202,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ
@@ -268,5 +267,4 @@ test_files:
 - spec/unit/bunny_spec.rb
 - spec/unit/concurrent/condition_spec.rb
 - spec/unit/concurrent/linked_continuation_queue_spec.rb
-- spec/unit/transport_spec.rb
 has_rdoc: true

data/spec/unit/transport_spec.rb

@@ -1,18 +0,0 @@
-require "spec_helper"
-
-# mystically fails on Rubinius on CI. MK.
-if RUBY_ENGINE != "rbx"
-  describe Bunny::Transport, ".reachable?" do
-    it "returns true for google.com, 80" do
-      Bunny::Transport.reacheable?("google.com", 80, 1).should be_true
-    end
-
-    it "returns true for google.com, 8088" do
-      Bunny::Transport.reacheable?("google.com", 8088, 1).should be_false
-    end
-
-    it "returns false for google1237982792837.com, 8277" do
-      Bunny::Transport.reacheable?("google1237982792837.com", 8277, 1).should be_false
-    end
-  end
-end