fastly_nsq 1.9.3 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60a5dae5d0ca5d80aae1aff914ea705b6d3303c957ea4380de1d2038d82f9283
-  data.tar.gz: ce70c136e7a4d192a077b5b8daf9a62bcb95ee8640e057dd796034b5386b774a
+  metadata.gz: 50a60efb4df61a42c1a86afc21062375622f93e3d68d8f0c6f08ff60e44aa57b
+  data.tar.gz: effddde6ad0930afb14c007f03aada0637437651ccd62b36c1b5a1b5b84a4344
 SHA512:
-  metadata.gz: d7db6c545ae860e6faf892a6b8f172d02fae61b0c1257a61270bfe3acbb2e3d4c6c19f994b1fdf61db5ade5e38f90d9112afb381302b36b948ff693aa3a8ae0a
-  data.tar.gz: a3046c80c90a7f989b3f34e403c383938de9f1c019bfde537354a5d47b8017604008e42311740d0a94bd841df01d6af4ecc184c09d6a0094af29142a9a5cfa7b
+  metadata.gz: d3a447b9a80c310994775ebd89d13bcdde8ccd4f9d9defa4891f9a67d62a2a4ac63c79a0dffaa93c906721e5e2e90504fdefc8ca7137740c23e1509ef64003ef
+  data.tar.gz: 2b602098ff5095cba6c8fc1f02ec9cdd693c4cc0ba7361fe43a1a63b5b641218016b086da426c3052ffd40758e2a6abf865733f7bcbd894f9f2dff1a14c01725

data/ChangeLog.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [v1.10.0](https://github.com/fastly/fastly_nsq/tree/HEAD)
+
+[Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.9.3...v1.10.0)
+
+**Merged pull requests:**
+
+- add max\_req\_timeout \[IE-2040\] [\#85](https://github.com/fastly/fastly_nsq/pull/85) ([leklund](https://github.com/leklund))
+
 ## [v1.9.3](https://github.com/fastly/fastly_nsq/tree/v1.9.3) (2018-07-13)
 [Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.9.2...v1.9.3)
 
@@ -373,4 +381,4 @@
 ## [v0.0.1](https://github.com/fastly/fastly_nsq/tree/v0.0.1) (2016-01-30)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -157,6 +157,9 @@ FastlyNsq.configure do |config|
   config.logger = Logger.new
   config.preprocessor = ->(_) { FastlyNsq.logger.info 'PREPROCESSESES' }
 
+  config.max_attempts = 20
+  config.max_req_timeout = (60 * 60 * 4 * 1_000) # 4 hours
+
   lc.listen 'posts', ->(m) { puts "posts: #{m.body}" }
   lc.listen 'blogs', ->(m) { puts "blogs: #{m.body}" }, priority: 3
 end

data/lib/fastly_nsq.rb

@@ -26,6 +26,10 @@ module FastlyNsq
     # @return [Integer]
     attr_accessor :max_attempts
 
+    # Set Maximum requeue timeout in milliseconds
+    # @return [Integer]
+    attr_writer :max_req_timeout
+
     # @return [Logger]
     attr_writer :logger
 
@@ -87,6 +91,17 @@ module FastlyNsq
       @manager = manager
     end
 
+    ##
+    # Maximum requeue timeout in milliseconds. This setting controls the
+    # maximum value that will be sent from FastlyNsq::Message#requeue This
+    # value should be less than or equal to the nsqd command line option
+    # +max-req-timeout+. The default setting is 1 hour.
+    # @return [Integer]
+    # @see https://nsq.io/components/nsqd.html#command-line-options
+    def max_req_timeout
+      @max_req_timeout ||= ENV.fetch('MAX_REQ_TIMEOUT', 60 * 60 * 1_000)
+    end
+
     ##
     # Return an array of NSQ lookupd http addresses sourced from ENV['NSQLOOKUPD_HTTP_ADDRESS']
     # @return [Array<String>] list of nsqlookupd http addresses

data/lib/fastly_nsq/message.rb

@@ -64,11 +64,16 @@ class FastlyNsq::Message
 
   ##
   # Requeue an NSQ Message
+  # If the +timeout+ parameter or the caclulated backoff is greater
+  # than FastlyNsq.max_req_timeout, the +max_req_timeout+ will be used
+  # to requeue the message.
   # @param timeout [Integer] timeout in milliseconds
   def requeue(timeout = nil)
     return managed if managed
     timeout ||= requeue_period
 
+    timeout = [timeout, FastlyNsq.max_req_timeout].min
+
     @managed = :requeued
     nsq_message.requeue(timeout)
   end

data/lib/fastly_nsq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastlyNsq
-  VERSION = '1.9.3'
+  VERSION = '1.10.0'
 end

data/spec/message_spec.rb

@@ -69,4 +69,10 @@ RSpec.describe FastlyNsq::Message do
 
     subject.requeue
   end
+
+  it 'uses the FastlyNsq.max_req_timeout it timeout is larger than FastlyNsq.max_req_timeout' do
+    expect(nsq_message).to receive(:requeue).with(60 * 60 * 1_000)
+
+    subject.requeue(60 * 60 * 4 * 1_000)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.10.0
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print