sensu-redis 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 130f1d035399f05c74f3540743bfea9496d416ad
-  data.tar.gz: 3f1f33e4524d9691f8ed0924c66159d16cd7cd0b
+  metadata.gz: 5939b7177d92baf80d426264a3243a6d0920d9dd
+  data.tar.gz: eee5530168c09cadb6eb766a62e4056e112c77b5
 SHA512:
-  metadata.gz: 76f796f5c02eb17b2b5ec6443d6f9352909ae05e974a7db64d2e59af679d27466bf1d1e03c7d11c68c755b56e5860ec5dd9adf8f889ab68c973cc9898be66dea
-  data.tar.gz: 9cb0310c6bb4efd8935411bc97d88fb36178179f85e6ba7beac56864e935180d9618582a690ebeb56f7c5645b4e94475559b25650646c010a733d8e3e858b7a4
+  metadata.gz: 1105045f20f729b050ea48fe32cb89162debddd8e07243a8bd7ea9a1d788c5c73e4ddb7fbcb33c8fcf21c7d67c71b60f0292b6d0aef4829970c9d37111c9ff37
+  data.tar.gz: d1d84791dc6aec961652f85d7064484a20e36662d2378c4ee85f4f11e1019dfdded03c2f1eef97e937cb0efa3a9feaa6d29a244c809c3c981a7cdee3a5fc58a4

data/lib/sensu/redis/sentinel.rb

@@ -1,9 +1,12 @@
 require "sensu/redis/client"
+require "sensu/redis/utilities"
 require "eventmachine"
 
 module Sensu
   module Redis
     class Sentinel
+      include Utilities
+
       attr_accessor :logger
 
       # Initialize the Sentinel connections. The default Redis master
@@ -15,26 +18,35 @@ module Sensu
       #   connection settings.
       def initialize(options={})
         @master = options[:master_group] || options[:master] || "mymaster"
-        @sentinels = connect_to_sentinels(options[:sentinels])
+        @sentinels = []
+        connect_to_sentinels(options[:sentinels])
       end
 
-      # Connect to a Sentinel instance.
+      # Connect to a Sentinel instance and add the connection to
+      # `@sentinels` to be called upon. This method defaults the
+      # Sentinel host and port if either have not been set.
       #
       # @param options [Hash] containing the host and port.
-      # @return [Object] Sentinel connection.
       def connect_to_sentinel(options={})
         options[:host] ||= "127.0.0.1"
         options[:port] ||= 26379
-        EM.connect(options[:host], options[:port].to_i, Client, options)
+        resolve_host(options[:host]) do |ip_address|
+          if ip_address.nil?
+            EM::Timer.new(1) do
+              connect_to_sentinel(options)
+            end
+          else
+            @sentinels << EM.connect(ip_address, options[:port].to_i, Client, options)
+          end
+        end
       end
 
-      # Connect to all Sentinel instances. This method defaults the
-      # Sentinel host and port if either have not been set.
+      # Connect to all Sentinel instances. The Sentinel instance
+      # connections will be added to `@sentinels`.
       #
       # @param sentinels [Array]
-      # @return [Array] of Sentinel connection objects.
       def connect_to_sentinels(sentinels)
-        sentinels.map do |options|
+        sentinels.each do |options|
           connect_to_sentinel(options)
         end
       end

data/sensu-redis.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-redis"
-  spec.version       = "2.3.0"
+  spec.version       = "2.4.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com", "engineering@sensu.io"]
   spec.summary       = "The Sensu Redis client library"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-redis
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Sean Porter
@@ -30,7 +30,7 @@ cert_chain:
   jOeGyhtQa9j4FFmsEJDg59f5v/3hECXsa3Xuml3foaFHzX3Ya/YIyd2YFxvkFKIu
   GVbe7A3YdxzdkH2Es/Ym9twdxXaIDdXzj8sWhw==
   -----END CERTIFICATE-----
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine