vx-consumer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c09af6eb8d570916b1ea57a6c5968ef05da1d93
-  data.tar.gz: 60fd28a772622324cdf571152465d3a2775b3468
+  metadata.gz: a4ba824b3b9047df1c4d5fe74e531bdc1f884535
+  data.tar.gz: f31036250c862fb2975c7ff2bb52cf8674812351
 SHA512:
-  metadata.gz: 5a6913319e7df53244e328531db53defd613c305f8848e5d2cb6093792e23f8101bc093ef277e3d3754f31d51b0209dcf5c1b18a49a8ea5e80f93ddecc30a2b1
-  data.tar.gz: 063f23c5b56403293ff4a5cd8cb0499caf0cd8104d215ebefcb404b802373ef623c9d70203ce000ebcdeced6041207f4b5dd10dc8daef4eadd087fdc4b607444
+  metadata.gz: b6b60d2dd3c3bdc6aeeced8807b354aff3d0815e35d87b1d2f0cd76d895981dc0c532f80343dc854f26ecfcff825980bcecce03b2acc1db1ff9545daa4a1049b
+  data.tar.gz: bde55043df8b5d64668643cfedaeeb8caacb48bbbabf5d2f9ace3c47bc5f2b1d7aef062f03b9314b4ab079f18e79871a25ee894962c4137f871e3d038abbce26

data/.travis.yml

@@ -2,9 +2,8 @@ services:
   - rabbitmq
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
   - jruby
 
 matrix:

data/README.md

@@ -27,3 +27,4 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+

data/lib/vx/consumer/ack.rb

@@ -7,6 +7,7 @@ module Vx
           consumer:      self.class.params.consumer_name,
           properties:    properties,
           multiple:      multiple,
+          channel:       _channel.id
         }
         if _channel.open?
           _channel.ack delivery_info.delivery_tag, multiple
@@ -24,6 +25,7 @@ module Vx
           properties:    properties,
           multiple:      multiple,
           requeue:       requeue,
+          channel:       channel.id
         }
         if _channel.open?
           _channel.ack delivery_info.delivery_tag, multiple, requeue

data/lib/vx/consumer/publish.rb

@@ -24,8 +24,8 @@ module Vx
         }
 
         with_middlewares :pub, instrumentation do
-          instrument("process_publishing", instrumentation) do
-            session.with_channel do |ch|
+          with_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
               x.publish encoded, options
@@ -36,6 +36,10 @@ 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

@@ -40,9 +40,9 @@ module Vx
       def close
         if open?
           @@session_lock.synchronize do
-            instrument("closing_collection", info: conn_info)
+            instrument("closing_connection", info: conn_info)
 
-            instrument("close_collection", info: conn_info) do
+            instrument("close_connection", info: conn_info) do
               begin
                 conn.close
                 while conn.status != :closed
@@ -98,10 +98,23 @@ module Vx
         end
       end
 
-      def with_channel
+      def pub_channel
         assert_connection_is_open
 
-        conn.with_channel { |ch| yield ch }
+        key = :vx_consumer_session_pub_channel
+        ch  = Thread.current[key]
+
+        if ch and ch.closed?
+          ch = nil
+        end
+
+        unless ch
+          ch = conn.create_channel
+          assign_error_handlers_to_channel(ch)
+          ch
+        end
+
+        ch
       end
 
       def declare_exchange(ch, name, options = nil)
@@ -118,6 +131,11 @@ module Vx
         ch.queue name, options
       end
 
+      def assign_error_handlers_to_channel(ch)
+        ch.on_uncaught_exception {|e, c| ::Vx::Consumer.exception_handler(e, consumer: c) }
+        ch.on_error {|e, c| ::Vx::Consumer.exception_handler(e, consumer: c) }
+      end
+
       private
 
         def assert_connection_is_open

data/lib/vx/consumer/subscribe.rb

@@ -27,6 +27,7 @@ module Vx
           consumer:   params.consumer_name,
           payload:    payload,
           properties: properties,
+          channel:    channel.id
         }
 
         with_middlewares :sub, instrumentation do
@@ -60,7 +61,7 @@ module Vx
           session.open
 
           ch = session.conn.create_channel
-          assign_error_handlers_to_channel(ch)
+          session.assign_error_handlers_to_channel(ch)
           ch.prefetch configuration.prefetch
 
           x = session.declare_exchange ch, params.exchange_name, params.exchange_options
@@ -80,11 +81,6 @@ module Vx
           [ch, q]
         end
 
-        def assign_error_handlers_to_channel(ch)
-          ch.on_uncaught_exception {|e, c| Consumer.exception_handler(e, consumer: c) }
-          ch.on_error {|e, c| Consumer.exception_handler(e, consumer: c) }
-        end
-
     end
   end
 end

data/lib/vx/consumer/subscriber.rb

@@ -32,11 +32,12 @@ module Vx
       def call(*args)
         in_progress do
           @on_delivery.call(*args) if @on_delivery
+          sleep 0
         end
       end
 
       def cancel
-        instrument('cancel_consumer', consumer: vx_consumer_name)
+        instrument('cancel_consumer', consumer: vx_consumer_name, channel: channel.id)
         super
         channel.close unless channel.closed?
       end

data/lib/vx/consumer/version.rb

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

data/spec/lib/consumer_spec.rb

@@ -4,6 +4,10 @@ require 'spec_helper'
 
 describe Vx::Consumer do
 
+  before do
+    Bob.timeout = 0.1
+  end
+
   context "test consumer declaration" do
     context "alice" do
       subject { Alice.params }
@@ -22,7 +26,7 @@ describe Vx::Consumer do
       its(:exchange_name)    { should eq 'bob_exch' }
       its(:exchange_options) { should eq(durable: false, auto_delete: true, type: :topic) }
       its(:queue_name)       { should eq 'bob_queue' }
-      its(:queue_options)    { should eq(exclusive: true, durable: false) }
+      its(:queue_options)    { should eq(durable: false, auto_delete: true) }
       its(:ack)              { should be_true }
       its(:routing_key)      { should be_nil }
       its(:content_type)     { should eq 'application/json' }
@@ -60,7 +64,7 @@ describe Vx::Consumer do
 
       Timeout.timeout(10) do
         loop do
-          break if Bob._collected.size == 90
+          break if Bob._collected.size >= 90
           sleep 0.1
         end
       end
@@ -107,20 +111,23 @@ describe Vx::Consumer do
   end
 
   it "should work with graceful shutdown" do
+    Bob.timeout = 1
+
     consumer = Bob.subscribe
     10.times do |n|
       Bob.publish a: n
     end
 
-    sleep 0.2
-    Timeout.timeout(1) do
+    sleep 0.1
+    Timeout.timeout(5) do
       consumer.graceful_shutdown
     end
 
-    expect(Bob._collected).to have_at_least(2).item
+    expect(Bob._collected).to_not be_empty
   end
 
   it "running? should be true when consumer process task" do
+    Bob.timeout = 1
     consumer = Bob.subscribe
 
     expect(consumer.running?).to be_false
@@ -136,6 +143,7 @@ describe Vx::Consumer do
       consumer.cancel
     end
 
+    sleep 0.1
     expect(consumer.running?).to be_false
   end
 

data/spec/support/test_consumers.rb

@@ -14,13 +14,16 @@ class Bob
   include Vx::Consumer
 
   exchange 'bob_exch',  durable: false, auto_delete: true
-  queue    'bob_queue', exclusive: true, durable: false
+  queue    'bob_queue', durable: false, auto_delete: true
   ack
 
   @@m         = Mutex.new
   @@collected = []
 
   class << self
+
+    attr_accessor :timeout
+
     def _collected
       @@collected
     end
@@ -40,7 +43,7 @@ class Bob
 
   def perform(payload)
     self.class._save payload
-    sleep 0.1
+    sleep self.class.timeout
     ack
   end
 end

data/vx-consumer.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'bunny', '= 1.1.1'
+  spec.add_runtime_dependency 'bunny', '= 1.2.2'
   spec.add_runtime_dependency 'vx-common-rack-builder', '>= 0.0.2'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", '2.14.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-consumer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: vx-common-rack-builder
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 description: ' description '
 email:
 - dima.exe@gmail.com
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: summary