action_subscriber 2.5.0.pre → 2.5.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbba2d8f10337f7f4ed5b07d542d3fab0c7a822c
-  data.tar.gz: 37813575c5a5c88b61bdd99594794b649e8b82df
+  metadata.gz: 85dc20de7aa4e917f499156bb94d4b2e40b9ed12
+  data.tar.gz: 7f34bea3b45e1e230cbc55e4e432540094c6241a
 SHA512:
-  metadata.gz: 8e838f5d455228a31af45060733e8a5b471c8c8e1be88e98804ba10cdee347d0647019c34fff9f269947812430ab042922261be6f9555912ebd445fc01e921ac
-  data.tar.gz: 6bf2c26d643c144cee46696888ef072037577b960ac5608246aa7103ff14ed82b32dde9d03aca50311663e599b6c1b22da1f8d08227b9cb5daf6239966f43f58
+  metadata.gz: c2b3f863edc1609bc43f403b519cb05c62a7b4dc7e7b8f2048d076fdb7d4523271bd742e3006f67e50b34360c2ac357dc773771e1e0b6d321450e941effed54f
+  data.tar.gz: a4261aa2255ad0eb865a1d3e64b0249ea0fac3b91a103301f337ca715777913ff7e1e2a1fe13b6f69a2b2cfcf1bc2d8fb87018c0653fc2ec0e73738cda6e594c

data/.travis.yml

@@ -3,8 +3,8 @@ rvm:
  - 2.2.4
  - 2.3.0
  - jruby-9.0.4.0
+ - jruby-9.1.5.0
  - jruby-head
- - rbx-2
 services:
  - rabbitmq
 sudo: false
@@ -12,4 +12,3 @@ cache: bundler
 matrix:
   allow_failures:
     - rvm: jruby-head
-    - rvm: rbx-2

data/lib/action_subscriber.rb

@@ -27,6 +27,7 @@ require "action_subscriber/march_hare/subscriber"
 require "action_subscriber/babou"
 require "action_subscriber/publisher"
 require "action_subscriber/publisher/async"
+require "action_subscriber/synchronizer"
 require "action_subscriber/route"
 require "action_subscriber/route_set"
 require "action_subscriber/router"

data/lib/action_subscriber/bunny/subscriber.rb

@@ -11,6 +11,10 @@ module ActionSubscriber
         bunny_consumers.each(&:cancel)
       end
 
+      def create_queue(channel, queue_name, queue_options)
+        ::Bunny::Queue.new(channel, queue_name, queue_options)
+      end
+
       def auto_pop!
         # Because threadpools can be large we want to cap the number
         # of times we will pop each time we poll the broker

data/lib/action_subscriber/march_hare/subscriber.rb

@@ -7,6 +7,12 @@ module ActionSubscriber
         march_hare_consumers.each(&:cancel)
       end
 
+      def create_queue(channel, queue_name, queue_options)
+        queue = ::MarchHare::Queue.new(channel, queue_name, queue_options)
+        queue.declare!
+        queue
+      end
+
       def auto_pop!
         # Because threadpools can be large we want to cap the number
         # of times we will pop each time we poll the broker

data/lib/action_subscriber/route_set.rb

@@ -26,8 +26,14 @@ module ActionSubscriber
 
     def setup_queue(route)
       channel = ::ActionSubscriber::RabbitConnection.subscriber_connection.create_channel
+      # Make channels threadsafe again! Believe Me!
+      # Accessing channels from multiple threads for messsage acknowledgement will crash
+      # a channel and stop messages from being received on that channel
+      # this isn't very clear in the documentation for march_hare/bunny, but it is
+      # explicitly addresses here: https://github.com/rabbitmq/rabbitmq-java-client/issues/53
+      channel = ::ActionSubscriber::Synchronizer.new(channel)
       exchange = channel.topic(route.exchange)
-      queue = channel.queue(route.queue, :durable => route.durable)
+      queue = create_queue(channel, route.queue, :durable => route.durable)
       queue.bind(exchange, :routing_key => route.routing_key)
       queue
     end

data/lib/action_subscriber/synchronizer.rb

@@ -0,0 +1,15 @@
+require "thread"
+module ActionSubscriber
+  class Synchronizer
+    def initialize(delegate)
+      @delegate = delegate
+      @mutex = ::Mutex.new
+    end
+
+    def method_missing(name, *args, &block)
+      @mutex.synchronize do
+        @delegate.public_send(name, *args, &block)
+      end
+    end
+  end
+end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "2.5.0.pre"
+  VERSION = "2.5.0.pre2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 2.5.0.pre
+  version: 2.5.0.pre2
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -224,6 +224,7 @@ files:
 - lib/action_subscriber/router.rb
 - lib/action_subscriber/rspec.rb
 - lib/action_subscriber/subscribable.rb
+- lib/action_subscriber/synchronizer.rb
 - lib/action_subscriber/threadpool.rb
 - lib/action_subscriber/uri.rb
 - lib/action_subscriber/version.rb
@@ -277,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: ActionSubscriber is a DSL that allows a rails app to consume messages from