message-driver 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f5ef960a3a18031fa4f37ed941eae929da2237d
-  data.tar.gz: 699dee982c1d805fde348b8af5354df212cabc03
+  metadata.gz: 2f6ca18a14ba62a965bc18eac1072208821266e6
+  data.tar.gz: dbed32cf2ad5170579f1e013c85c79a94f0264e0
 SHA512:
-  metadata.gz: 362dffea89638f6366ecf26e673c510aa40981e77f590470e377d51b87e07271caa151bcc8d04b948e1dbe7d1a9268b7cba57fa646328645e8ab58b318ea31cc
-  data.tar.gz: b044a83acfc3be5a1a6760eb1543cca63f6cf4b08f07a9a3a0e697bdd152e1aa546580a628351986fcbc2156c6c1d2724d101632c18366cecefd6b85750e80e1
+  metadata.gz: 9aae643f4f2396e55fbb848770530832ad4729e7fe566219f2c178f22e199adda8d19e70f766b248043f9c2a496909f4b343c575c303ab87ed105162c7138688
+  data.tar.gz: 85430c090e5667abe21e58207bcfaafc7e1d9122c260b2c2b50fc0956d8fa645c730db0ef2e678d0f1dc7d23e2a10630b978717f7051ea11dcfab5f3be9e0c93

data/.travis.yml

@@ -13,12 +13,13 @@ env:
   - ADAPTER=stomp
   - ADAPTER=bunny:1.0.0
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
   - 1.9.2
   - jruby-19mode
   - jruby-head
-  - rbx-19mode
+  - rbx
 matrix:
   exclude:
     - rvm: jruby-19mode
@@ -26,8 +27,7 @@ matrix:
     - rvm: jruby-head
       env: ADAPTER=bunny:0.9.0
   allow_failures:
-    - env: ADAPTER=bunny:1.0.0.rc
     - rvm: jruby-head
-    - rvm: rbx-19mode
+    - rvm: rbx
     - rvm: jruby-19mode
       env: ADAPTER=stomp

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 0.3.0.dev - master
 
+## 0.2.2 - 2014-02-21
+
+* Lots of work on reconnection handling for bunny. Still a work in
+  progress.
+
 ## 0.2.1 - 2013-11-13
 
 * Correct an issue in handling Bunny::ConnectionLevelErrors.

data/Gemfile

@@ -3,15 +3,22 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in message-driver.gemspec
 gemspec
 
+platform :rbx do
+  gem 'rubysl'
+end
+
 group :tools do
   gem 'guard'
   gem 'guard-bundler'
   gem 'guard-rspec'
   gem 'guard-cucumber'
   gem 'pry'
-  platform :ruby do
+  platform :ruby_19 do
     gem 'pry-debugger'
   end
+  platform :ruby_20 do
+    gem 'pry-byebug'
+  end
   group :darwin do
     gem 'ruby_gntp'
     gem 'rb-fsevent'

data/features/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 0.3.0.dev - master
 
+## 0.2.2 - 2014-02-21
+
+* Lots of work on reconnection handling for bunny. Still a work in
+  progress.
+
 ## 0.2.1 - 2013-11-13
 
 * Correct an issue in handling Bunny::ConnectionLevelErrors.

data/lib/bunny/session_patch.rb

@@ -0,0 +1,19 @@
+require 'bunny'
+
+module Bunny
+  class Session
+    def cleanup_threads
+      log_errors { self.maybe_shutdown_heartbeat_sender }
+      log_errors { self.maybe_shutdown_reader_loop }
+      log_errors { self.close_transport }
+    end
+
+    def log_errors
+      begin
+        yield
+      rescue => e
+        @logger.info "#{e.class}: #{e.to_s}"
+      end
+    end
+  end
+end

data/lib/message_driver/adapters/base.rb

@@ -3,14 +3,15 @@ module MessageDriver
     class Base
       include Logging
 
-      attr_accessor :contexts
+      def contexts
+        @contexts ||= []
+      end
 
       def initialize(configuration)
         raise "Must be implemented in subclass"
       end
 
       def new_context
-        @contexts ||= []
         ctx = build_context
         contexts << ctx
         ctx
@@ -21,7 +22,11 @@ module MessageDriver
       end
 
       def stop
-        contexts.each { |ctx| ctx.invalidate } if contexts
+        if @contexts
+          ctxs = @contexts
+          @contexts = []
+          ctxs.each { |ctx| ctx.invalidate }
+        end
       end
     end
 

data/lib/message_driver/adapters/bunny_adapter.rb

@@ -1,4 +1,5 @@
 require 'bunny'
+require 'bunny/session_patch'
 
 module MessageDriver
   class Broker
@@ -116,66 +117,75 @@ module MessageDriver
           raise MessageDriver::Error, "subscriptions are only supported with QueueDestinations" unless destination.is_a? QueueDestination
           @sub_ctx = adapter.new_subscription_context(self)
           @error_handler = options[:error_handler]
+          @ack_mode = case options[:ack]
+                      when :auto, nil
+                        :auto
+                      when :manual
+                        :manual
+                      when :transactional
+                        :transactional
+                      else
+                        raise MessageDriver::Error, "unrecognized :ack option #{options[:ack]}"
+                      end
+          start_subscription
+        end
+
+        def unsubscribe
+          unless @bunny_consumer.nil?
+            @bunny_consumer.cancel
+            @bunny_consumer = nil
+          end
+          unless @sub_ctx.nil?
+            @sub_ctx.invalidate(true)
+            @sub_ctx = nil
+          end
+        end
+
+        private
+        def start_subscription
           @sub_ctx.with_channel do |ch|
             queue = destination.bunny_queue(@sub_ctx.channel)
             if options.has_key? :prefetch_size
               ch.prefetch(options[:prefetch_size])
             end
-            ack_mode = case options[:ack]
-                       when :auto, nil
-                         :auto
-                       when :manual
-                         :manual
-                       when :transactional
-                         :transactional
-                       else
-                         raise MessageDriver::Error, "unrecognized :ack option #{options[:ack]}"
-                       end
             @bunny_consumer = queue.subscribe(options.merge(manual_ack: true)) do |delivery_info, properties, payload|
-              message = @sub_ctx.args_to_message(delivery_info, properties, payload)
               Client.with_adapter_context(@sub_ctx) do
-                begin
-                  case ack_mode
-                  when :auto
-                    consumer.call(message)
-                    @sub_ctx.ack_message(message)
-                  when :manual
-                    consumer.call(message)
-                  when :transactional
-                    Client.with_message_transaction do
-                      consumer.call(message)
-                      @sub_ctx.ack_message(message)
-                    end
-                  end
-                rescue => e
-                  if [:auto, :transactional].include? ack_mode
-                    requeue = true
-                    if e.is_a?(DontRequeue) || (options[:retry_redelivered] == false && message.redelivered?)
-                      requeue = false
-                    end
-                    if @sub_ctx.valid?
-                      begin
-                        @sub_ctx.nack_message(message, requeue: requeue)
-                      rescue => e
-                        logger.error exception_to_str(e)
-                      end
-                    end
-                  end
-                  @error_handler.call(e, message) unless @error_handler.nil?
-                end
+                message = @sub_ctx.args_to_message(delivery_info, properties, payload)
+                handle_message(message)
               end
             end
           end
         end
 
-        def unsubscribe
-          unless @bunny_consumer.nil?
-            @bunny_consumer.cancel
-            @bunny_consumer = nil
-          end
-          unless @sub_ctx.nil?
-            @sub_ctx.invalidate(true)
-            @sub_ctx = nil
+        def handle_message(message)
+          begin
+            case @ack_mode
+            when :auto
+              consumer.call(message)
+              @sub_ctx.ack_message(message)
+            when :manual
+              consumer.call(message)
+            when :transactional
+              Client.with_message_transaction do
+                consumer.call(message)
+                @sub_ctx.ack_message(message)
+              end
+            end
+          rescue => e
+            if [:auto, :transactional].include? @ack_mode
+              requeue = true
+              if e.is_a?(DontRequeue) || (options[:retry_redelivered] == false && message.redelivered?)
+                requeue = false
+              end
+              if @sub_ctx.valid?
+                begin
+                  @sub_ctx.nack_message(message, requeue: requeue)
+                rescue => e
+                  logger.error exception_to_str(e)
+                end
+              end
+            end
+            @error_handler.call(e, message) unless @error_handler.nil?
           end
         end
       end
@@ -183,12 +193,13 @@ module MessageDriver
       def initialize(config)
         validate_bunny_version
         @config = config
-        start_connection_thread
+        @handle_connection_errors = config.fetch(:handle_connection_errors, true)
+        initialize_connection
       end
 
       def connection(ensure_started=true)
-        start_connection_thread
-        if ensure_started && !@connection.open?
+        initialize_connection
+        if ensure_started
           begin
             @connection.start
           rescue *NETWORK_ERRORS => e
@@ -204,6 +215,10 @@ module MessageDriver
           @connection.close if !@connection.nil? && @connection.open?
         rescue *NETWORK_ERRORS => e
           logger.error "error while attempting connection close\n#{exception_to_str(e)}"
+        ensure
+          conn = @connection
+          @connection = nil
+          conn.cleanup_threads unless conn.nil?
         end
       end
 
@@ -340,10 +355,20 @@ module MessageDriver
         def invalidate(in_unsubscribe=false)
           super()
           unless @subscription.nil? || in_unsubscribe
-            @subscription.unsubscribe
+            begin
+              @subscription.unsubscribe if adapter.connection.open?
+            rescue => e
+              logger.debug "error trying to end subscription\n#{exception_to_str(e)}"
+            end
           end
           unless @channel.nil?
-            @channel.close if @channel.open?
+            begin
+              @channel.close if @channel.open? && adapter.connection.open?
+            rescue => e
+              logger.debug "error trying to close channel\n#{exception_to_str(e)}"
+            ensure
+              begin @channel.maybe_kill_consumer_work_pool! rescue nil; end
+            end
           end
         end
 
@@ -389,7 +414,7 @@ module MessageDriver
 
         def reset_channel
           unless @channel.open?
-            @channel.open
+            @channel = adapter.connection.create_channel
             @is_transactional = false
             @rollback_only = true if in_transaction?
           end
@@ -399,27 +424,44 @@ module MessageDriver
 
       private
 
-      def start_connection_thread
-        @connection_thread ||= Thread.new do
-          begin
-            @connection = Bunny.new(@config)
-            sleep
-          rescue *NETWORK_ERRORS => e
-            logger.error "error on connection\n#{exception_to_str(e)}"
-            begin
-              while true
-                @connection.start
+      def log_errors
+        begin
+          yield
+        rescue => e
+          logger.error exception_to_str(e)
+        end
+      end
+
+      def initialize_connection
+        if @handle_connection_errors
+          if @connection_thread.nil?
+            #hi mom!
+            @connection_thread = Thread.new do
+              @connection = Bunny.new(@config)
+              begin
                 sleep
+              rescue *NETWORK_ERRORS => e
+                logger.error "error on connection\n#{exception_to_str(e)}"
+                if @connection.automatically_recover?
+                  sleep 0.1
+                  unless @connection.recovering_from_network_failure?
+                    stop
+                  end
+                else
+                  stop
+                end
+                retry
+              rescue => e
+                logger.error "unhandled error in connection thread! #{exception_to_str(e)}"
               end
-            rescue *NETWORK_ERRORS => e
-              logger.error "error trying to restart connection\n#{exception_to_str(e)}"
-              sleep 1
-              retry
             end
+            @connection_thread.abort_on_exception = true
+            sleep 0.1
           end
-          @connection_thread = nil
+          sleep 0.1 while @connection_thread.status != 'sleep'
+        else
+          @connection ||= Bunny.new(@config)
         end
-        sleep 0.1 while @connection_thread.status != 'sleep'
       end
 
       def validate_bunny_version

data/lib/message_driver/broker.rb

@@ -7,8 +7,6 @@ module MessageDriver
 
     attr_reader :adapter, :configuration, :destinations, :consumers, :logger
 
-    def_delegators :@adapter, :stop
-
     class << self
       def configure(options)
         @instance = new(options)
@@ -29,6 +27,7 @@ module MessageDriver
 
     def initialize(options)
       @adapter = resolve_adapter(options[:adapter], options)
+      @stopped = false
       @configuration = options
       @destinations = {}
       @consumers = {}
@@ -36,6 +35,23 @@ module MessageDriver
       logger.debug "MessageDriver configured successfully!"
     end
 
+    def stop
+      @adapter.stop
+      @stopped = true
+    end
+
+    def stopped?
+      @stopped
+    end
+
+    def restart
+      unless stopped?
+        @adapter.stop
+      end
+      @adapter = resolve_adapter(@configuration[:adapter], @configuration)
+      @stopped = false
+    end
+
     def dynamic_destination(dest_name, dest_options={}, message_props={})
       Client.dynamic_destination(dest_name, dest_options, message_props)
     end

data/lib/message_driver/logging.rb

@@ -5,7 +5,7 @@ module MessageDriver
     end
 
     def exception_to_str(e)
-      ([e.to_s] + e.backtrace).join("  \n")
+      (["#{e.class}: #{e.to_s}"] + e.backtrace).join("\n  ")
     end
   end
 end

data/lib/message_driver/subscription.rb

@@ -1,6 +1,7 @@
 module MessageDriver
   module Subscription
     class Base
+      include Logging
       attr_reader :adapter, :destination, :consumer, :options
 
       def initialize(adapter, destination, consumer, options={})

data/lib/message_driver/version.rb

@@ -1,5 +1,5 @@
 module Message
   module Driver
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/spec/units/message_driver/broker_spec.rb

@@ -74,6 +74,65 @@ module MessageDriver
           described_class.new(adapter: adapter)
         }.to raise_error(/adapter must be a MessageDriver::Adapters::Base/)
       end
+
+      it "starts off with the adapter not stopped" do
+        adapter = :in_memory
+
+        instance = described_class.new(adapter: adapter)
+        expect(instance).not_to be_stopped
+      end
+    end
+
+    describe "#stop" do
+      let(:adapter) { broker.adapter }
+      it "calls stop on the adapter" do
+        allow(adapter).to receive(:stop).and_call_original
+
+        subject.stop
+
+        expect(adapter).to have_received(:stop)
+      end
+
+      it "marks the broker as stopped" do
+        expect {
+          subject.stop
+        }.to change { subject.stopped? }.from(false).to(true)
+      end
+
+      it "invalidates the contexts" do
+        my_ctx = double("context", invalidate: nil)
+        adapter.contexts << my_ctx
+        subject.stop
+        expect(adapter.contexts).to be_empty
+        expect(my_ctx).to have_received(:invalidate)
+      end
+    end
+
+    describe "#restart" do
+      let!(:original_adapter) { subject.adapter }
+      before do
+        allow(original_adapter).to receive(:stop).and_call_original
+      end
+
+      it "reconfigures the adapter" do
+        expect {
+          subject.restart
+        }.to change { subject.adapter }
+      end
+
+      it "stops the adapter if it hasn't already been stopped" do
+        subject.restart
+        expect(original_adapter).to have_received(:stop).once
+      end
+
+      it "does not stop the adapter again if it has already been stopped" do
+        expect(subject.adapter).to be original_adapter
+        subject.stop
+        expect {
+          subject.restart
+        }.to change { subject.stopped? }.from(true).to(false)
+        expect(original_adapter).to have_received(:stop).once
+      end
     end
 
     describe "#configuration" do

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: message-driver
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Matt Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Easy message queues for ruby using AMQ, STOMP and others
@@ -73,10 +73,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .relish
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".relish"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -124,6 +124,7 @@ files:
 - features/support/no_error_matcher.rb
 - features/support/test_runner.rb
 - features/support/transforms.rb
+- lib/bunny/session_patch.rb
 - lib/message-driver.rb
 - lib/message_driver.rb
 - lib/message_driver/adapters/base.rb
@@ -172,17 +173,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Easy message queues for ruby