nsq-ruby 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 229c1d668e9a72a150cf31a0a961ceb167487ff9
-  data.tar.gz: fd0037847e57c3d121c8cb3336b89552ab43c6e5
+SHA256:
+  metadata.gz: 6c931ee31ebc9745dba9e2084740d6022f97b0ef280d1661cc1391910481eee9
+  data.tar.gz: '0965ea14b66ebfa6d1ca429af3cab05f970418f5cd41241362619b1e19444a08'
 SHA512:
-  metadata.gz: 9bfde70b0deacc4ca79bad2dff9bf24494e7e713644ab3626f4ccea8b8e26e57863326e66d02d90fbe65c1ab1fa8f54387358a8bfdf30b17776a8f8528ba10d4
-  data.tar.gz: c54f95f3fe6840d316f8fda50d4d4560def806ef58dc9f0d7b3fa85a846522ee3253da966b9b0fe2c104d2e52c3eb65566cdfef11b25a61646cee247b02d1066
+  metadata.gz: 67e99a8a1b6051325fd04e56bda7910eb41f46a39bf9baf9969bbfa8b04af5b9a6fc2297f707eb1ffdbb4a257a138112532639662a4e484ec47608ba93bdbcb9
+  data.tar.gz: bec66cc5f0990f97d55551b0b786ad0043c70d0dbe14e6b728726bbbdbd551caaac012adc5bf3d699113c3f11e9e9885ca579be41c9d7bcc205d7326f90d68ec

data/README.md

@@ -191,6 +191,7 @@ producers when you're done with them.
 | `max_in_flight`      | Max number of messages for this consumer to have in flight at a time   | 1 |
 | `discovery_interval` | Seconds between queue discovery via nsqlookupd    | 60.0           |
 | `msg_timeout`        | Milliseconds before nsqd will timeout a message   | 60000          |
+| `max_attempts`       | Number of times a message will be attempted before being finished |  |
 | `tls_v1`             | Flag for tls v1 connections                   | false              |
 | `tls_options`        | Optional keys and certificates for TLS connections |               |
 
@@ -205,6 +206,7 @@ consumer = Nsq::Consumer.new(
   max_in_flight: 100,
   discovery_interval: 30,
   msg_timeout: 120_000,
+  max_attempts: 10,
   tls_v1: true,
   tls_options: {
     key: '/path/to/ssl/key.pem',
@@ -224,7 +226,8 @@ Notes:
   but to make the implementation of `nsq-ruby` as simple as possible, the minimum
   `max_in_flight` _per_ connection is 1. So if you set `max_in_flight` to 1 and
   are connected to 3 nsqds, you may have up to 3 messages in flight at a time.
-
+- `max_attempts` is optional and if not set messages will be attempted until they
+  are explicitly finshed.
 
 ### `#pop`
 

data/lib/nsq/connection.rb

@@ -32,6 +32,7 @@ module Nsq
       @msg_timeout = opts[:msg_timeout] || 60_000 # 60s
       @max_in_flight = opts[:max_in_flight] || 1
       @tls_options = opts[:tls_options]
+      @max_attempts = opts[:max_attempts]
       if opts[:ssl_context]
         if @tls_options
           warn 'ssl_context and tls_options both set. Using tls_options. Ignoring ssl_context.'
@@ -250,7 +251,11 @@ module Nsq
           error "Error received: #{frame.data}"
         elsif frame.is_a?(Message)
           debug "<<< #{frame.body}"
-          @queue.push(frame) if @queue
+          if @max_attempts && frame.attempts > @max_attempts
+            fin(frame.id)
+          else
+            @queue.push(frame) if @queue
+          end
         else
           raise 'No data from socket'
         end

data/lib/nsq/consumer.rb

@@ -17,6 +17,7 @@ module Nsq
       @max_in_flight = opts[:max_in_flight] || 1
       @discovery_interval = opts[:discovery_interval] || 60
       @msg_timeout = opts[:msg_timeout]
+      @max_attempts = opts[:max_attempts]
       @ssl_context = opts[:ssl_context]
       @tls_options = opts[:tls_options]
       @tls_v1 = opts[:tls_v1]
@@ -75,7 +76,8 @@ module Nsq
         channel: @channel,
         queue: @messages,
         msg_timeout: @msg_timeout,
-        max_in_flight: 1
+        max_in_flight: 1,
+        max_attempts: @max_attempts
       }.merge(options))
     end
 

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Nsq
   module Version
     MAJOR = 2
-    MINOR = 2
+    MINOR = 3
     PATCH = 0
     BUILD = nil
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nsq-ruby
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Wistia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby client library for NSQ