fastly_nsq 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec5180b8b65ede93fdbb509c673c8bb539f9010e
-  data.tar.gz: 58705d4fe6bd3fb791803f393db63fb53b57c3ae
+  metadata.gz: 64261464e7b2c73f8de59ff0a463addef794753a
+  data.tar.gz: 3c85eb1c230574998ec0bc44a6464d03a675092c
 SHA512:
-  metadata.gz: 787a47a30094daac20acc0db56e9a257716be62f2a212df288fa2c488646508bc49fd8589d034b661bbdf38183ddba1ad627c10967796a63cbeb29f8fc3c66de
-  data.tar.gz: c0cfe65d8a15bca78def1d826f98ce4d632f6b09a581298e37ebfa8e4a3fca94d2e2b5b12473015291c881886e3ffa8cab442d1276d8620c755e7b1d06d59b8a
+  metadata.gz: 5dfb3407af2c44573556685180ae4917d10e0ed8b9a3d3be708da136833ae16d9733493a3b4bc1282a86dee3f0d3883082eed2f9e8a0593a37193650401fee0b
+  data.tar.gz: 44bb68a265f7e685c52c21408b9eba9c3a1a555b9ea291a057b946628db62ab08af51270d104fbc782a5a074e13fd6f9b4809d64546dca17bf0fa424c076d0e2

data/lib/fastly_nsq/listener.rb

@@ -61,8 +61,6 @@ module FastlyNsq
     rescue Exception => ex # rubocop:disable Lint/RescueException
       @logger.error ex.inspect
       @manager.listener_killed(self)
-    ensure
-      cleanup
     end
 
     def status
@@ -71,12 +69,14 @@ module FastlyNsq
 
     def terminate
       @done = true
+      cleanup
       return unless @thread
       @logger.info "< Listener TERM: topic #{@topic}"
     end
 
     def kill
       @done = true
+      cleanup
       return unless @thread
       @logger.info "< Listener KILL: topic #{@topic}"
       @thread.raise FastlyNsq::Shutdown
@@ -90,7 +90,7 @@ module FastlyNsq
 
     def cleanup
       @consumer.terminate
-      @logger.info '< Consumer terminated'
+      @logger.info "< Consumer terminated: topic [#{@topic}]"
     end
 
     def next_message

data/lib/fastly_nsq/version.rb

@@ -1,3 +1,3 @@
 module FastlyNsq
-  VERSION = '0.12.0'.freeze
+  VERSION = '0.12.1'.freeze
 end

data/spec/lib/fastly_nsq/listener_spec.rb

@@ -168,10 +168,13 @@ RSpec.describe FastlyNsq::Listener do
         listener.start
         state = listener.instance_variable_get(:@done)
         expect(state).to eq false
+        consumer = listener.instance_variable_get(:@consumer)
+        allow(consumer).to receive(:terminate)
         listener.terminate
 
         state = listener.instance_variable_get(:@done)
-        expect(logger).to have_received(:info).twice
+        expect(logger).to have_received(:info).thrice
+        expect(consumer).to have_received(:terminate)
         expect(state).to eq true
       end
 
@@ -179,10 +182,13 @@ RSpec.describe FastlyNsq::Listener do
         listener.start
         state = listener.instance_variable_get(:@done)
         expect(state).to eq false
+        consumer = listener.instance_variable_get(:@consumer)
+        allow(consumer).to receive(:terminate)
         listener.kill
 
         state = listener.instance_variable_get(:@done)
-        expect(logger).to have_received(:info).twice
+        expect(logger).to have_received(:info).thrice
+        expect(consumer).to have_received(:terminate)
         expect(thread).to have_received(:raise).with(FastlyNsq::Shutdown)
         expect(state).to eq true
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print