sensu-redis 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e5f7655bb7532d8a8eceb8c97355780c0662871
-  data.tar.gz: 845f5bea88e14f020730b9d10eb17a8c6f2f5f51
+  metadata.gz: 130f1d035399f05c74f3540743bfea9496d416ad
+  data.tar.gz: 3f1f33e4524d9691f8ed0924c66159d16cd7cd0b
 SHA512:
-  metadata.gz: 4b27ec1f7c0b62543fa239ee74365d6c5bdd25a618ccdd6b97cc0ff2ee290adb1d87b7dfa1df2a79200ef3c25bf674d84e2b63b3de28e9a3018a2ef194e40943
-  data.tar.gz: 768b1a5b3010565f0c4eafa7ee2f52816e93fad31df22de9fa66fa1da2cad6609504c6ec63b19a8c9c2118250a54be286eb21552d25a979f7e5001f9f7883b48
+  metadata.gz: 76f796f5c02eb17b2b5ec6443d6f9352909ae05e974a7db64d2e59af679d27466bf1d1e03c7d11c68c755b56e5860ec5dd9adf8f889ab68c973cc9898be66dea
+  data.tar.gz: 9cb0310c6bb4efd8935411bc97d88fb36178179f85e6ba7beac56864e935180d9618582a690ebeb56f7c5645b4e94475559b25650646c010a733d8e3e858b7a4

data/lib/sensu/redis/client.rb

@@ -19,6 +19,7 @@ module Sensu
         @port = (options[:port] || 6379).to_i
         @db = options[:db]
         @password = options[:password]
+        @tls = options[:tls] || options[:ssl]
         @auto_reconnect = options.fetch(:auto_reconnect, true)
         @reconnect_on_error = options.fetch(:reconnect_on_error, true)
         @error_callback = Proc.new {}
@@ -264,12 +265,14 @@ module Sensu
       end
 
       # This method is called by EM when the connection is
-      # established. This method is reponsible for validating the
-      # connection before Redis commands can be sent.
+      # established. This method is reponsible for upgrading to TLS if
+      # necessary and validating the connection before Redis commands
+      # can be sent.
       def connection_completed
         @response_callbacks = []
         @multibulk_count = false
         @connected = true
+        start_tls(@tls) unless @tls.nil?
         authenticate do
           select_db
           verify_version do
@@ -280,6 +283,20 @@ module Sensu
         end
       end
 
+      # This method is called by EM when the SSL/TLS handshake has
+      # been completed, as a result of calling #start_tls to initiate
+      # SSL/TLS on the connection. Log when the TLS handshake is
+      # complete.
+      def ssl_handshake_completed
+        if @logger
+          @logger.debug("redis tls handshake complete", {
+            :host => @host,
+            :port => @port,
+            :tls => @tls
+          })
+        end
+      end
+
       # Begin a multi bulk response array for an expected number of
       # responses. Using this method causes `dispatch_response()` to
       # wait until all of the expected responses have been added to

data/sensu-redis.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-redis"
-  spec.version       = "2.2.1"
+  spec.version       = "2.3.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.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Sean Porter
@@ -30,7 +30,7 @@ cert_chain:
   jOeGyhtQa9j4FFmsEJDg59f5v/3hECXsa3Xuml3foaFHzX3Ya/YIyd2YFxvkFKIu
   GVbe7A3YdxzdkH2Es/Ym9twdxXaIDdXzj8sWhw==
   -----END CERTIFICATE-----
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine