fastly_nsq 0.12.2 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03fbb1644325f6357fad234932a15ad97e7d432b
-  data.tar.gz: 070e6c0fe34dbabd2184f5de8be59a52cc50e111
+  metadata.gz: a3a42709debb8a573f27df0efdb01b0ff2c30c01
+  data.tar.gz: 4abd037e9a15eebb9c442a48fdc6c76a7fdd5536
 SHA512:
-  metadata.gz: a27648b9853176003f2fcd333e0f237f47e71e5452900894e3615aaa9975be5e19d38f12a3ee42b9d016e68a8a4cb96ed7b4448e962a240c9dc505cf6b9a7a7b
-  data.tar.gz: c4824d03aa286a62482f9135b7ad25796e6e4b67c3e0385dd86d6c083300ccbfe545eac2027c7ec126ff71d375ff533b4d315cac2da375e16734c1d3d3d8649c
+  metadata.gz: 3059ee3d302f936190ba3f5992fde033f8854ba7b3bf5bdd79628db891e07fdb1bdb6afcb0c19645a4281b41891520db1a2fdcae12a23deeebcadac9498b0737
+  data.tar.gz: 16f02d1c0238c80b7820761664d29125f6505175b4095ecd53f132711d8d3bc4b7a3006ffb84421b8f36f36fb93e5df4c50d8ae633ed00d99967eba148e85522

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.8
   - 2.2.4
-  - 2.3.0
+  - 2.3.5
+  - 2.4.2
 script:
   - bundle exec rake
 notifications:

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 0.12.3 / 2017-11-02
+
+* Remove initialization Timeout on Consumer Connections
+
 ### 0.9.0 / 2016-12-20
 
 * Add FastlyNsq::Messenger to persist Producers

data/README.md

@@ -170,7 +170,7 @@ block. An exmaple of this can be found here: [`Example Config`](exmaple_config_c
 
 An example of using the cli:
 ```bash
-./bin/fastly_nsq -r ./example_config_class.rb -L ./test.log -P ./fastly_nsq.pid -v -d
+./bin/fastly_nsq -r ./example_config_class.rb -L ./test.log -P ./fastly_nsq.pid -v -d -t 4
 ```
 
 ### FastlyNsq::Messgener

data/lib/fastly_nsq/cli.rb

@@ -92,6 +92,10 @@ class FastlyNsq::CLI
       o.on '-v', '--verbose', 'enable verbose logging output' do |arg|
         opts[:verbose] = arg
       end
+
+      o.on '-t', '--timeout SECONDS', 'shutdown deadline timeout' do |arg|
+        opts[:timeout] = arg
+      end
     end
 
     @parser.banner = 'fastly_nsq [options]'

data/lib/fastly_nsq/consumer.rb

@@ -13,13 +13,11 @@ module FastlyNsq
       @channel     = channel
       @tls_options = TlsOptions.as_hash(tls_options)
       @connector   = connector
-      Timeout.timeout(5) do
-        sleep(0.1) until connection.connected?
-      end
-    rescue Timeout::Error => error
-      FastlyNsq.logger.error "Consumer for #{topic} failed to connect!"
-      connection.terminate
-      raise error
+      connection
+    end
+
+    def empty?
+      connection.size == 0 # rubocop:disable ZeroLengthPredicate
     end
 
     private

data/lib/fastly_nsq/fake_backend.rb

@@ -83,6 +83,10 @@ module FastlyNsq
         queue.size
       end
 
+      def empty?
+        queue.empty?
+      end
+
       def terminate
         # noop
       end

data/lib/fastly_nsq/launcher.rb

@@ -24,7 +24,7 @@ class FastlyNsq::Launcher
   # return until all work is complete and cleaned up.
   # It can take up to the timeout to complete.
   def stop
-    deadline = Time.now + @options.fetch(:timeout, 10)
+    deadline = Time.now + @options.fetch(:timeout, 5)
     quiet
     @manager.stop deadline
   end

data/lib/fastly_nsq/listener.rb

@@ -72,7 +72,8 @@ module FastlyNsq
       cleanup
       return unless @thread
       @logger.info "< Listener TERM: topic #{@topic}"
-      @thread.raise FastlyNsq::Shutdown
+      # Interrupt a Consumer blocking in pop with no messages otherwise it will never shutdown
+      @thread.raise FastlyNsq::Shutdown if @consumer.empty?
     end
 
     def kill

data/lib/fastly_nsq/version.rb

@@ -1,3 +1,3 @@
 module FastlyNsq
-  VERSION = '0.12.2'.freeze
+  VERSION = '0.12.4'.freeze
 end

data/spec/lib/fastly_nsq/launcher_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe FastlyNsq::Launcher do
   let(:launcher) { FastlyNsq::Launcher.new options }
   let(:manager)  { instance_double 'Manager', start: nil, quiet: nil, stop: nil }
   let(:thread)   { instance_double 'Thread' }
-  let(:options)  { { joe: 'biden' } }
+  let(:options)  { { joe: 'biden', timeout: 9 } }
 
   before do
     allow(FastlyNsq::Manager).to receive(:new).and_return(manager)
@@ -44,7 +44,7 @@ RSpec.describe FastlyNsq::Launcher do
       now = Time.now
       allow(Time).to receive(:now).and_return(now)
       launcher.stop
-      expect(manager).to have_received(:stop).with(now + 10)
+      expect(manager).to have_received(:stop).with(now + options[:timeout])
     end
 
     it 'quites the manager' do

data/spec/lib/fastly_nsq/listener_spec.rb

@@ -178,6 +178,23 @@ RSpec.describe FastlyNsq::Listener do
         expect(state).to eq true
       end
 
+      it 'raise in terminate to interupt blocking on an empty queue' do
+        listener.start
+        listener.terminate
+
+        expect(consumer.empty?).to be true
+        expect(thread).to have_received(:raise)
+      end
+
+      it 'terminate allows messages to be completed' do
+        100.times { FastlyNsq::Messenger.deliver(on_topic: topic, message: 'test_message') }
+        listener.start
+        listener.terminate
+
+        expect(consumer.empty?).to be false
+        expect(thread).to_not have_received(:raise)
+      end
+
       it 'can be killed' do
         listener.start
         state = listener.instance_variable_get(:@done)

metadata

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