vx-consumer 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47b8bcadacba1121ca2956db329217f76ce4e9b6
-  data.tar.gz: 679bba4a1158a235190ac403ef9919d6e198cf44
+  metadata.gz: a79fce4c98aaa9738bb22a70fa147cf95c73db0a
+  data.tar.gz: 9cf4f8badc9bf307f9536d79c06ac98495f0d56e
 SHA512:
-  metadata.gz: 2bed198aba1934ca5a6d459a63c438e94193412b145e18b9dbce5217ceebaeeb179d70fc1b2fc2ba6ea8b7ca0dba2e3f846f1cefd57965cf68079177477326eb
-  data.tar.gz: a7d709c2fd93a2b10a5e081b9297580a81e76571a5b61f62496a20af82c1f973505c9486e5a4481b73cec318d19d0845b7ad4d43cd1527746cb0081547709631
+  metadata.gz: 6698982507cfc51b46758857572729db54170fc53a5bfc9a81d875bac64e1c0cc9f45e7ed793bb2295618a5d2ee58a4bb0ef284dcf4613be2bfdaae0cb07bc61
+  data.tar.gz: ee61109d2a8f491c5093b120ee984ee1616f04ff208a3385e9c30a0d6776403e9b40ae41ea83d8e98bf879f2892fbe69a656a71f89f226e3f1417cc76e53b620

data/.travis.yml

@@ -4,10 +4,5 @@ services:
 rvm:
   - 2.0
   - 2.1
-  - jruby
-
-matrix:
-  allow_failures:
-    - rvm: jruby
 
 script: bundle exec rspec spec/ -b

data/lib/vx/consumer/subscriber.rb

@@ -15,8 +15,11 @@ module Vx
       end
 
       def graceful_shutdown
-        instrument('graceful_shutdown_consumer', consumer: vx_consumer_name)
-        in_progress { cancel }
+        instrument('try_graceful_shutdown_consumer', consumer: vx_consumer_name)
+        in_progress do
+          cancel
+          instrument('graceful_shutdown_consumer', consumer: vx_consumer_name)
+        end
       end
 
       def try_graceful_shutdown
@@ -52,8 +55,10 @@ module Vx
 
       def cancel
         instrument('cancel_consumer', consumer: vx_consumer_name, channel: channel.id)
-        super
-        channel.close unless channel.closed?
+        unless channel.closed?
+          super
+          channel.close unless channel.closed?
+        end
       end
 
       def join

data/lib/vx/consumer/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Consumer
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/spec/lib/consumer_spec.rb

@@ -38,13 +38,16 @@ describe Vx::Consumer do
     sleep 1
     3.times {|n| Bob.publish("a" => n) }
 
-    Timeout.timeout(3) do
+    Timeout.timeout(5) do
       loop do
         break if Bob._collected.size == 3
         sleep 0.1
       end
     end
-    consumer.cancel
+
+    Timeout.timeout(3) do
+      consumer.graceful_shutdown
+    end
 
     expect(Bob._collected).to eq([{"a"=>0}, {"a"=>1}, {"a"=>2}])
   end
@@ -68,7 +71,10 @@ describe Vx::Consumer do
           sleep 0.1
         end
       end
-      cns.map(&:cancel)
+
+      Timeout.timeout(1) do
+        cns.map(&:graceful_shutdown)
+      end
 
       expect(Bob._collected.map{|c| c["a"] }.uniq.sort).to eq((0...90).to_a)
     end

data/vx-consumer.gemspec

@@ -18,7 +18,7 @@ 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.3.0'
+  spec.add_runtime_dependency 'bunny', '= 1.3.1'
   spec.add_runtime_dependency 'vx-common-rack-builder', '>= 0.0.2'
 
   spec.add_development_dependency "bundler", "~> 1.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-consumer
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: vx-common-rack-builder
   requirement: !ruby/object:Gem::Requirement