nsq-ruby 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f37fc34c90bdbfed9f8f653ebb360f3449f2b617
-  data.tar.gz: b10cf00412546004c46e2c620671b565c405b107
+  metadata.gz: cbfb90bdb3cd20d66a806966a6b3eda69128da2d
+  data.tar.gz: 34768fbb3f8146dd971c24cf14e8f8a6eb33dc5a
 SHA512:
-  metadata.gz: 5fb3324959318b2b7f7be1ab989ddfe521dfee92eb7e9a2a3e002d611904c44f38d42da8a57f29baed4d80d477f9ddc37bc884008a21920378dfb41db3c0d657
-  data.tar.gz: 17a7c36cd9f9a245183af03cf73a3a027df5028c151399780e102494bf1db61ae46f85f500eb1e1e70ff609c4e6159e28d0f9c85cd55feac51121f86af5d98c9
+  metadata.gz: baffdc2899b758231cd9cece73b598114d826bd18ca4bc909873f353884dd0ca15f5c6f612ad6dd5b6cf032a283c9f080df992cd9d264a28c4d6a5474bd4d89a
+  data.tar.gz: 16eec84732c35cca1adafa34b4ecd6cb08ced46f534977fd801552d5ca3f28e82853ce7427e100ad5a180693eeac3f1beac04c996fef87a597c10fdd120f15b3

data/README.md

@@ -234,7 +234,7 @@ Nsq.logger = Logger.new(STDOUT)
 
 ## Requirements
 
-NSQ v0.2.29 or later due for IDENTITY metadata specification (0.2.28) and per-
+NSQ v0.2.29 or later for IDENTIFY metadata specification (0.2.28) and per-
 connection timeout support (0.2.29).
 
 
@@ -244,6 +244,7 @@ connection timeout support (0.2.29).
 - Automatic reconnection to nsqd
 - Producing to all nsqd instances automatically via nsqlookupd
 
+
 ### Does not support
 
 - TLS

data/lib/nsq/connection.rb

@@ -137,21 +137,12 @@ module Nsq
     end
 
 
-    # Block until we get an OK from nsqd
-    def wait_for_ok
-      frame = receive_frame
-      unless frame.is_a?(Response) && frame.data == RESPONSE_OK
-        raise "Received non-OK response while IDENTIFYing: #{frame.data}"
-      end
-    end
-
-
     def identify
       hostname = Socket.gethostname
       metadata = {
         client_id: Socket.gethostbyname(hostname).flatten.compact.first,
         hostname: hostname,
-        feature_negotiation: false,
+        feature_negotiation: true,
         heartbeat_interval: 30_000, # 30 seconds
         output_buffer: 16_000, # 16kb
         output_buffer_timeout: 250, # 250ms
@@ -163,6 +154,16 @@ module Nsq
         msg_timeout: @msg_timeout
       }.to_json
       write_to_socket ["IDENTIFY\n", metadata.length, metadata].pack('a*l>a*')
+
+      # Now wait for the response!
+      frame = receive_frame
+      server = JSON.parse(frame.data)
+
+      if @max_in_flight > server['max_rdy_count']
+        raise "max_in_flight is set to #{@max_in_flight}, server only supports #{server['max_rdy_count']}"
+      end
+
+      @server_version = server['version']
     end
 
 
@@ -199,10 +200,11 @@ module Nsq
     def decrement_in_flight
       @presumed_in_flight -= 1
 
-      # now that we're less than @max_in_flight we might need to re-up our RDY
-      # state
-      threshold = (@max_in_flight * 0.2).ceil
-      re_up_ready if @presumed_in_flight <= threshold
+      if server_needs_rdy_re_ups?
+        # now that we're less than @max_in_flight we might need to re-up our RDY state
+        threshold = (@max_in_flight * 0.2).ceil
+        re_up_ready if @presumed_in_flight <= threshold
+      end
     end
 
 
@@ -312,7 +314,6 @@ module Nsq
       # it gets to nsqd ahead of anything in the `@write_queue`
       write_to_socket '  V2'
       identify
-      wait_for_ok
 
       start_read_loop
       start_write_loop
@@ -387,5 +388,14 @@ module Nsq
     def snooze(t)
       sleep(t)
     end
+
+
+    def server_needs_rdy_re_ups?
+      # versions less than 0.3.0 need RDY re-ups
+      # see: https://github.com/bitly/nsq/blob/master/ChangeLog.md#030---2014-11-18
+      @server_version.split('.')[0].to_i == 0 && @server_version.split('.')[1].to_i <= 2
+    end
+
+
   end
 end

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Nsq
   module Version
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     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: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Wistia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler