nsq-ruby 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbfb90bdb3cd20d66a806966a6b3eda69128da2d
-  data.tar.gz: 34768fbb3f8146dd971c24cf14e8f8a6eb33dc5a
+  metadata.gz: 09966bb130fd77c7eb78c70c654afb4b2bd2246c
+  data.tar.gz: a900ade8f7497c4fcc738cd82900f90da7bb0172
 SHA512:
-  metadata.gz: baffdc2899b758231cd9cece73b598114d826bd18ca4bc909873f353884dd0ca15f5c6f612ad6dd5b6cf032a283c9f080df992cd9d264a28c4d6a5474bd4d89a
-  data.tar.gz: 16eec84732c35cca1adafa34b4ecd6cb08ced46f534977fd801552d5ca3f28e82853ce7427e100ad5a180693eeac3f1beac04c996fef87a597c10fdd120f15b3
+  metadata.gz: 9f7ce184b29b4eb00b46826a0ae3bbaa408cef197c89f6c074d4379c6e8e5623f38bcea1a587550c14734fdd19bb133f186ed910e85c5255c11d659ff70b4176
+  data.tar.gz: 2a0360c7b8b90e9099ae1e3dc1ad96de0ead23b3732ccafdc02e851fcab4af9a087c44f43f96d1d5d5ab34c2da45c086616bc17e19cb1bf3b5a1bbf029cdcb10

data/lib/nsq.rb

@@ -2,6 +2,8 @@ require_relative 'version'
 
 require_relative 'nsq/logger'
 
+require_relative 'nsq/exceptions'
+
 require_relative 'nsq/frames/frame'
 require_relative 'nsq/frames/error'
 require_relative 'nsq/frames/response'

data/lib/nsq/client_base.rb

@@ -36,8 +36,14 @@ module Nsq
         @discovery = Discovery.new(opts[:nsqlookupds])
 
         loop do
-          nsqds = nsqds_from_lookupd(opts[:topic])
-          drop_and_add_connections(nsqds)
+          begin
+            nsqds = nsqds_from_lookupd(opts[:topic])
+            drop_and_add_connections(nsqds)
+          rescue DiscoveryException
+            # We can't connect to any nsqlookupds. That's okay, we'll just
+            # leave our current nsqd connections alone and try again later.
+            warn 'Could not connect to any nsqlookupd instances in discovery loop'
+          end
           sleep opts[:interval]
         end
 

data/lib/nsq/connection.rb

@@ -393,7 +393,8 @@ module Nsq
     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
+      major, minor, patch = @server_version.split('.').map(&:to_i)
+      major == 0 && minor <= 2
     end
 
 

data/lib/nsq/discovery.rb

@@ -21,10 +21,12 @@ module Nsq
     #     discovery.nsqds
     #     #=> ['127.0.0.1:4150', '127.0.0.1:4152']
     #
+    # If all nsqlookupd's are unreachable, raises Nsq::DiscoveryException
+    #
     def nsqds
-      @lookupds.map do |lookupd|
+      gather_nsqds_from_all_lookupds do |lookupd|
         get_nsqds(lookupd)
-      end.flatten.uniq
+      end
     end
 
     # Returns an array of nsqds instances that have messages for
@@ -35,14 +37,32 @@ module Nsq
     #     discovery.nsqds_for_topic('a-topic')
     #     #=> ['127.0.0.1:4150', '127.0.0.1:4152']
     #
+    # If all nsqlookupd's are unreachable, raises Nsq::DiscoveryException
+    #
     def nsqds_for_topic(topic)
-      @lookupds.map do |lookupd|
+      gather_nsqds_from_all_lookupds do |lookupd|
         get_nsqds(lookupd, topic)
-      end.flatten.uniq
+      end
     end
 
+
     private
 
+    def gather_nsqds_from_all_lookupds
+      nsqd_list = @lookupds.map do |lookupd|
+        yield(lookupd)
+      end.flatten
+
+      # All nsqlookupds were unreachable, raise an error!
+      if nsqd_list.length > 0 && nsqd_list.all? { |nsqd| nsqd.nil? }
+        raise DiscoveryException
+      end
+
+      nsqd_list.compact.uniq
+    end
+
+    # Returns an array of nsqd addresses
+    # If there's an error, return nil
     def get_nsqds(lookupd, topic = nil)
       uri_scheme = 'http://' unless lookupd.match(%r(https?://))
       uri = URI.parse("#{uri_scheme}#{lookupd}")
@@ -68,7 +88,7 @@ module Nsq
         end
       rescue Exception => e
         error "Error during discovery for #{lookupd}: #{e}"
-        []
+        nil
       end
     end
 

data/lib/nsq/exceptions.rb

@@ -0,0 +1,5 @@
+module Nsq
+  # Raised when nsqlookupd discovery fails
+  class DiscoveryException < Exception; end
+end
+

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nsq-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Wistia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - lib/nsq/connection.rb
 - lib/nsq/consumer.rb
 - lib/nsq/discovery.rb
+- lib/nsq/exceptions.rb
 - lib/nsq/frames/error.rb
 - lib/nsq/frames/frame.rb
 - lib/nsq/frames/message.rb