sensu-redis 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bfbf215d8c3a1975203dc6f5c08d65e54ff3167
-  data.tar.gz: 9ba122e38b68809b037ddf97a338729a6d8104fc
+  metadata.gz: 943d104005cbb1b8424389ff4b296aff1eef0479
+  data.tar.gz: f1e7cb7e03104cc4f24c5f5eeb4fea4e272b57fd
 SHA512:
-  metadata.gz: 0416a9108788879d8cb8a6f688142a85b87f9c5d5a324c0e8301f823557f3d8994b5e2413719e178ed785579fd7e452de6d3ac3c03e7251f6199eef600081b7f
-  data.tar.gz: 84569b024c3cae5f170ddc0e3c5fa39ebff6b838ed7c6952190c54e236534743f159e7b61c753153ded0d6137b835a991166887dd248fad9f6330d314e98866c
+  metadata.gz: e34128ed6b726437f697b1e91799071c04267ccd4e7b5f5157ac14845133aedefcba10578b43ff7f37f90fec6a858ebe4f47784931d54cd1252a0a57c82171d8
+  data.tar.gz: c92241f1594511f74031827131548f2414c2b067ab983b1f8d126a7dbf5e981d5817785072f2c8500b63bfba4ec5a63770d1620cc8379b0934d2d82bbd7a93f6

data/lib/sensu/redis.rb

@@ -42,6 +42,7 @@ module Sensu
       # @yield callback to be called with the redis connection object.
       def connect_via_sentinel(options, &block)
         sentinel = Sentinel.new(options)
+        sentinel.logger = @logger
         sentinel.resolve do |host, port|
           redis = EM.connect(host, port, Client, options)
           redis.logger = @logger

data/lib/sensu/redis/client.rb

@@ -121,6 +121,7 @@ module Sensu
       # starting the reconnect process when appropriate.
       def unbind
         @deferred_status = nil
+        @pubsub_callbacks = nil
         if @closing
           @reconnecting = false
         elsif ((@connected || @reconnecting) && @auto_reconnect) || @reconnect_on_error
@@ -189,7 +190,8 @@ module Sensu
       # @param channel [String]
       # @yield channel message callback.
       def subscribe(channel, &block)
-        @pubsub_callbacks ||= Hash.new([])
+        @pubsub_callbacks ||= {}
+        @pubsub_callbacks[channel] ||= []
         @pubsub_callbacks[channel] << block
         redis_command(SUBSCRIBE_COMMAND, channel, &block)
       end
@@ -202,7 +204,7 @@ module Sensu
       # @param channel [String]
       # @yield unsubscribe callback.
       def unsubscribe(channel=nil, &block)
-        @pubsub_callbacks ||= Hash.new([])
+        @pubsub_callbacks ||= {}
         arguments = [UNSUBSCRIBE_COMMAND]
         if channel
           @pubsub_callbacks[channel] = [block]

data/lib/sensu/redis/sentinel.rb

@@ -4,6 +4,8 @@ require "eventmachine"
 module Sensu
   module Redis
     class Sentinel
+      attr_accessor :logger
+
       # Initialize the Sentinel connections. The default Redis master
       # name is "mymaster", which is the same name that the Sensu HA
       # Redis documentation uses. The master name must be set
@@ -12,7 +14,7 @@ module Sensu
       # @param options [Hash] containing the standard Redis
       #   connection settings.
       def initialize(options={})
-        @master = options[:master] || "mymaster"
+        @master = options[:master_group] || options[:master] || "mymaster"
         @sentinels = connect_to_sentinels(options[:sentinels])
       end
 
@@ -78,14 +80,30 @@ module Sensu
       def resolve(&block)
         sentinel = select_a_sentinel
         if sentinel.nil?
+          if @logger
+            @logger.debug("unable to determine redis master", {
+              :reason => "not connected to a redis sentinel"
+            })
+            @logger.debug("retrying redis master resolution via redis sentinel")
+          end
           retry_resolve(&block)
         else
           timeout = create_resolve_timeout(sentinel, 10, &block)
           sentinel.redis_command("sentinel", "get-master-addr-by-name", @master) do |host, port|
             timeout.cancel
             if host && port
+              @logger.debug("redis master resolved via redis sentinel", {
+                :host => host,
+                :port => port.to_i
+              }) if @logger
               block.call(host, port.to_i)
             else
+              if @logger
+                @logger.debug("unable to determine redis master", {
+                  :reason => "redis sentinel did not return a redis master host and port"
+                })
+                @logger.debug("retrying redis master resolution via redis sentinel")
+              end
               retry_resolve(&block)
             end
           end

data/sensu-redis.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-redis
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine