vx-consumer 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4ba824b3b9047df1c4d5fe74e531bdc1f884535
-  data.tar.gz: f31036250c862fb2975c7ff2bb52cf8674812351
+  metadata.gz: 855e8429df6a59a3a5ef9343411369be93f3af1a
+  data.tar.gz: 0c7df3bf9e3cc3efca543a5f09ecd0051c209f0c
 SHA512:
-  metadata.gz: b6b60d2dd3c3bdc6aeeced8807b354aff3d0815e35d87b1d2f0cd76d895981dc0c532f80343dc854f26ecfcff825980bcecce03b2acc1db1ff9545daa4a1049b
-  data.tar.gz: bde55043df8b5d64668643cfedaeeb8caacb48bbbabf5d2f9ace3c47bc5f2b1d7aef062f03b9314b4ab079f18e79871a25ee894962c4137f871e3d038abbce26
+  metadata.gz: 4fcb5d02ba1364f8717e07bc34da09417e73ddffa5b1b4cc851c97822250215a81e66eb8bc8017e42376e58068ea27940528ae38aed426074d021ada219154bd
+  data.tar.gz: b1d57a0b754c90455467b0550086def194a1b790a079a428f4add5bb7be569e30c11da33c7ddc5b4f3c9ef09f24708a15c097ae228ea6be29c52fe82b002dcbe

data/lib/vx/consumer/publish.rb

@@ -24,7 +24,7 @@ module Vx
         }
 
         with_middlewares :pub, instrumentation do
-          with_channel do |ch|
+          session.with_pub_channel do |ch|
             instrument("process_publishing", instrumentation.merge(channel: ch.id)) do
               encoded = encode_payload(payload, options[:content_type])
               x = session.declare_exchange ch, name, params.exchange_options
@@ -36,10 +36,6 @@ module Vx
 
       private
 
-        def with_channel
-          yield session.pub_channel
-        end
-
         def encode_payload(payload, content_type)
           Serializer.pack(content_type, payload)
         end

data/lib/vx/consumer/session.rb

@@ -98,23 +98,36 @@ module Vx
         end
       end
 
-      def pub_channel
+      def with_pub_channel
+        key = :vx_consumer_session_pub_channel
+        if ch = Thread.current[key]
+          yield ch
+        else
+          conn.with_channel do |c|
+            yield c
+          end
+        end
+      end
+
+      def allocate_pub_channel
         assert_connection_is_open
 
         key = :vx_consumer_session_pub_channel
-        ch  = Thread.current[key]
 
-        if ch and ch.closed?
-          ch = nil
-        end
-
-        unless ch
+        if Thread.current[key]
+          yield
+        else
           ch = conn.create_channel
           assign_error_handlers_to_channel(ch)
-          ch
+          Thread.current[key] = ch
+          begin
+            yield
+          ensure
+            ch = Thread.current[key]
+            ch.close if ch.open?
+            Thread.current[key] = nil
+          end
         end
-
-        ch
       end
 
       def declare_exchange(ch, name, options = nil)

data/lib/vx/consumer/subscribe.rb

@@ -33,7 +33,9 @@ module Vx
         with_middlewares :sub, instrumentation do
           instrument("start_processing", instrumentation)
           instrument("process", instrumentation) do
-            run_instance delivery_info, properties, payload, channel
+            allocate_pub_channel do
+              run_instance delivery_info, properties, payload, channel
+            end
           end
         end
       end

data/lib/vx/consumer/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Consumer
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/lib/vx/consumer.rb

@@ -77,6 +77,10 @@ module Vx
         Consumer.session
       end
 
+      def allocate_pub_channel
+        Consumer.session.allocate_pub_channel { yield }
+      end
+
       def configuration
         Consumer.configuration
       end

data/spec/lib/consumer_spec.rb

@@ -119,7 +119,7 @@ describe Vx::Consumer do
     end
 
     sleep 0.1
-    Timeout.timeout(5) do
+    Timeout.timeout(10) do
       consumer.graceful_shutdown
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-consumer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny