action_subscriber 5.1.2 → 5.1.3.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b6dd62b9d5f71b0f161b71a7cf59a485178d9fe2056ae79554b9bdad48b61e9
-  data.tar.gz: 6bdb8e90b287c2d14ff429e34b7c6892fe19544f1625a1f7df80de4e7a0dbb09
+  metadata.gz: fa5bf15c517485c9cccb0106e54b710a9ea27f531206b7f631c90b034214b45e
+  data.tar.gz: e1c884f440fa8fef25b63f04fa574e458ff60a2a0887b6fc2b1e44f96fb973e7
 SHA512:
-  metadata.gz: 7cb13e80ea9341fa93ce77474463fde461b962065a65e1d7c9789b1e99cbe87ab2719139de583f51445f8ab4894406b29e5993e9042f2f93239b47f29fb00206
-  data.tar.gz: 95227585a26ffdccae8785deeb6579eff286c6ea782c5ee83934c7049355a99d2a722054866eba173e514292b01c92a57e7ab80aab4c12e9f13190c559d8cf6b
+  metadata.gz: 8eff6bc852dbdbc1d96e0ef6894b8329a015542b7bb8764fba11d46c279c380c9eacf610de3e24a8729b38e8b8dba42b8d339eefad9f12dd5fad356596661dc6
+  data.tar.gz: 244a5f01766f1c3428a36a8f5cac737d4545d71f9202b92183ea7ccf39fac87cfdaea4499f9e59ef979f7627025402ded93885d015b82387226852104f1c3741

data/lib/action_subscriber/message_retry.rb

@@ -46,16 +46,25 @@ module ActionSubscriber
     end
 
     def self.with_exchange(env, ttl, retry_queue_name)
-      channel = RabbitConnection.with_connection{|connection| connection.create_channel}
-      begin
+      unless env.channel.open?
+        begin
+          channel = RabbitConnection.with_connection{|connection| connection.create_channel}
+          channel.confirm_select
+          # an empty string is the default exchange [see bunny docs](http://rubybunny.info/articles/exchanges.html#default_exchange)
+          exchange = channel.topic("")
+          queue = channel.queue(retry_queue_name, :arguments => {"x-dead-letter-exchange" => "", "x-message-ttl" => ttl, "x-dead-letter-routing-key" => env.queue})
+          yield(exchange)
+          channel.wait_for_confirms
+        ensure
+          channel.close rescue nil
+        end
+      else
         channel.confirm_select
         # an empty string is the default exchange [see bunny docs](http://rubybunny.info/articles/exchanges.html#default_exchange)
         exchange = channel.topic("")
         queue = channel.queue(retry_queue_name, :arguments => {"x-dead-letter-exchange" => "", "x-message-ttl" => ttl, "x-dead-letter-routing-key" => env.queue})
         yield(exchange)
         channel.wait_for_confirms
-      ensure
-        channel.close rescue nil
       end
     end
   end

data/lib/action_subscriber/middleware/env.rb

@@ -6,6 +6,7 @@ module ActionSubscriber
       attr_accessor :payload
 
       attr_reader :action,
+                  :channel,
                   :content_type,
                   :encoded_payload,
                   :exchange,

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "5.1.2"
+  VERSION = "5.1.3.pre1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.3.pre1
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -292,12 +292,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: ActionSubscriber is a DSL that allows a rails app to consume messages from