sensu-transport 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ce225a451ad7f61802de97848a4cc88153f3ebb
-  data.tar.gz: 2a206e0652fc6c6735a86aeb7be35b218ee14c0d
+  metadata.gz: 6ddf38a57a53500e8ce070c590f8d97abf95ca38
+  data.tar.gz: d4077218d37391f5b88ff1bbd52857062838f17d
 SHA512:
-  metadata.gz: 24be969e850d8a38bdf898a01c61a4923e970a77cf38bc31b4ef0e2b771785fdc7fca9bbb6b848383f3dc9d467a568666b0b2a43384ba0979465919a656ce196
-  data.tar.gz: 52c1e08b2a6daf56195866c649e465951a3f925f0267c7e3c42101659ba8d4941c7e34f5c5c8a5312db23419269e8e42a73a46f3187085734698270f943884a9
+  metadata.gz: 445b1f8dcf4720f5cfb624547c14efa7b4058600ab0ec462a60479ed24e738fbd5af9c5a027eafb602be7e67b27ca42d626c3f9168c651493076ce6b83884bb3
+  data.tar.gz: 589e362b85523ec6bf53913acdb4e191c89e9e2b51463484278b8004703ab10c195ad0f62953997bec0c31416c2f5f260f9d37bfa73dbb4d1e1dfaac76ad3cd7

data/.travis.yml

@@ -1,12 +1,12 @@
 sudo: false
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
   - 2.1.0
-  - jruby-1.7.18
+  - 2.2.0
+  - 2.2.3
+  - 2.3.0
+  - jruby-1.7.23
 services:
   - rabbitmq
   - redis

data/lib/sensu/transport.rb

@@ -12,6 +12,8 @@ module Sensu
       #
       # @param transport_name [String] transport name.
       # @param options [Hash] transport options.
+      # @yield [Object] passes initialized and connected connection
+      #   object to the callback/block.
       def connect(transport_name, options={})
         require("sensu/transport/#{transport_name}")
         klass = Base.descendants.detect do |klass|
@@ -20,7 +22,9 @@ module Sensu
         transport = klass.new
         transport.logger = @logger
         transport.connect(options)
-        transport
+        transport.callback do
+          yield(transport)
+        end
       end
     end
   end

data/lib/sensu/transport/base.rb

@@ -5,6 +5,11 @@ module Sensu
     class Error < StandardError; end
 
     class Base
+      # Transports are deferrable objects. This is to enable callbacks
+      # to be called in the event the transport calls `succeed()` to
+      # indicate that it has initialized and connected successfully.
+      include EM::Deferrable
+
       # @!attribute [rw] logger
       #   @return [Logger] the Sensu logger object.
       attr_accessor :logger

data/lib/sensu/transport/rabbitmq.rb

@@ -8,7 +8,9 @@ require File.join(File.dirname(__FILE__), "patches", "amqp")
 module Sensu
   module Transport
     class RabbitMQ < Base
-      # RabbitMQ connection setup.
+      # RabbitMQ connection setup. The deferred status is set to
+      # `:succeeded` (via `succeed()`) once the connection has been
+      # established.
       #
       # @param options [Hash, String]
       def connect(options={})
@@ -190,6 +192,7 @@ module Sensu
         @connection.logger = @logger
         @connection.on_open do
           @connection_timeout.cancel
+          succeed
           yield if block_given?
         end
         @connection.on_tcp_connection_loss(&reconnect_callback)
@@ -200,7 +203,7 @@ module Sensu
         @channel = AMQP::Channel.new(@connection)
         @channel.auto_recovery = true
         @channel.on_error do |channel, channel_close|
-          error = Error.new("rabbitmq channel closed")
+          error = Error.new("rabbitmq channel error")
           @on_error.call(error)
         end
         prefetch = 1
@@ -229,6 +232,7 @@ module Sensu
               end
             rescue EventMachine::ConnectionError
             rescue Java::JavaLang::RuntimeException
+            rescue Java::JavaNioChannels::UnresolvedAddressException
             end
           end
         end

data/lib/sensu/transport/redis.rb

@@ -1,11 +1,10 @@
-require "em-redis-unified"
+require "sensu/redis"
 
 require File.join(File.dirname(__FILE__), "base")
 
 module Sensu
   module Transport
     class Redis < Base
-
       # The Redis keyspace to use for the transport.
       REDIS_KEYSPACE = "transport"
 
@@ -15,13 +14,18 @@ module Sensu
         super
       end
 
-      # Redis transport connection setup. This method sets `@options`
-      # and creates a named Redis connection "redis".
+      # Redis transport connection setup. This method sets `@options`,
+      # creates a named Redis connection "redis", and sets the deferred
+      # status to `:succeeded` via `succeed()`.
       #
       # @param options [Hash, String]
       def connect(options={})
         @options = options || {}
-        redis_connection("redis")
+        redis_connection("redis") do |connection|
+          connection.callback do
+            succeed
+          end
+        end
       end
 
       # Reconnect to the Redis transport. The Redis connections used
@@ -134,12 +138,14 @@ module Sensu
       # @yield [info] passes list stats to the callback/block.
       # @yieldparam info [Hash] contains list stats.
       def stats(funnel, options={})
-        redis_connection("redis").llen(funnel) do |messages|
-          info = {
-            :messages => messages,
-            :consumers => 0
-          }
-          yield(info)
+        redis_connection("redis") do |connection|
+          connection.llen(funnel) do |messages|
+            info = {
+              :messages => messages,
+              :consumers => 0
+            }
+            yield(info)
+          end
         end
       end
 
@@ -178,18 +184,23 @@ module Sensu
       # up the connection and before adding it to the pool.
       #
       # @param name [String] the Redis connection name.
-      # @return [Object]
+      # @yield [Object] passes the named connection object to the
+      #   callback/block.
       def redis_connection(name)
-        return @connections[name] if @connections[name]
-        connection = EM::Protocols::Redis.connect(@options)
-        connection.auto_reconnect = false
-        connection.reconnect_on_error = false
-        connection.on_error do |error|
-          @on_error.call(error)
+        if @connections[name]
+          yield(@connections[name])
+        else
+          Sensu::Redis.connect(@options) do |connection|
+            connection.auto_reconnect = false
+            connection.reconnect_on_error = false
+            connection.on_error do |error|
+              @on_error.call(error)
+            end
+            monitor_connections
+            @connections[name] = connection
+            yield(connection)
+          end
         end
-        monitor_connections
-        @connections[name] = connection
-        connection
       end
 
       # Create a Redis key within the defined Redis keyspace. This
@@ -219,9 +230,11 @@ module Sensu
       # @yieldparam subscribers [String] current subscriber count.
       def pubsub_publish(pipe, message)
         channel = redis_key("channel", pipe)
-        redis_connection("redis").publish(channel, message) do |subscribers|
-          info = {:subscribers => subscribers}
-          yield(info) if block_given?
+        redis_connection("redis") do |connection|
+          connection.publish(channel, message) do |subscribers|
+            info = {:subscribers => subscribers}
+            yield(info) if block_given?
+          end
         end
       end
 
@@ -244,15 +257,17 @@ module Sensu
       # @yieldparam message [String] message content.
       def pubsub_subscribe(pipe)
         channel = redis_key("channel", pipe)
-        redis_connection("pubsub").subscribe(channel) do |type, channel, message|
-          case type
-          when "subscribe"
-            @logger.debug("subscribed to redis channel: #{channel}") if @logger
-          when "unsubscribe"
-            @logger.debug("unsubscribed from redis channel: #{channel}") if @logger
-          when "message"
-            info = {:channel => channel}
-            yield(info, message)
+        redis_connection("pubsub") do |connection|
+          connection.subscribe(channel) do |type, channel, message|
+            case type
+            when "subscribe"
+              @logger.debug("subscribed to redis channel: #{channel}") if @logger
+            when "unsubscribe"
+              @logger.debug("unsubscribed from redis channel: #{channel}") if @logger
+            when "message"
+              info = {:channel => channel}
+              yield(info, message)
+            end
           end
         end
       end
@@ -269,9 +284,11 @@ module Sensu
       # @yieldparam queued [String] current list size.
       def list_publish(pipe, message)
         list = redis_key("list", pipe)
-        redis_connection("redis").rpush(list, message) do |queued|
-          info = {:queued => queued}
-          yield(info) if block_given?
+        redis_connection("redis") do |connection|
+          connection.rpush(list, message) do |queued|
+            info = {:queued => queued}
+            yield(info) if block_given?
+          end
         end
       end
 
@@ -288,9 +305,11 @@ module Sensu
       # @yieldparam info [Hash] an empty hash.
       # @yieldparam message [String] message content.
       def list_blpop(list, &callback)
-        redis_connection(list).blpop(list, 0) do |_, message|
-          EM::next_tick { list_blpop(list, &callback) }
-          callback.call({}, message)
+        redis_connection(list) do |connection|
+          connection.blpop(list, 0) do |_, message|
+            EM::next_tick { list_blpop(list, &callback) }
+            callback.call({}, message)
+          end
         end
       end
 

data/sensu-transport.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-transport"
-  spec.version       = "4.0.0"
+  spec.version       = "5.0.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu transport abstraction library"
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency("eventmachine")
   spec.add_dependency("amq-protocol", "1.9.2")
   spec.add_dependency("amqp", "1.5.0")
-  spec.add_dependency("em-redis-unified", ">= 1.0.0")
+  spec.add_dependency("sensu-redis", ">= 1.0.0")
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/spec/transport_spec.rb

@@ -8,22 +8,44 @@ describe "Sensu::Transport" do
   it "can load and connect to the rabbitmq transport" do
     async_wrapper do
       options = {}
-      transport = Sensu::Transport.connect("rabbitmq", options)
-      timer(1) do
+      Sensu::Transport.connect("rabbitmq", options) do |transport|
         expect(transport.connected?).to be(true)
         async_done
       end
     end
   end
 
-  it "can set the transport logger" do
+  it "can load and connect to the redis transport" do
+    async_wrapper do
+      options = {}
+      Sensu::Transport.connect("redis", options) do |transport|
+        expect(transport.connected?).to be(true)
+        async_done
+      end
+    end
+  end
+
+  it "can set the rabbitmq transport logger" do
+    async_wrapper do
+      logger = Logger.new(STDOUT)
+      Sensu::Transport.logger = logger
+      Sensu::Transport.connect("rabbitmq") do |transport|
+        expect(transport.logger).to eq(logger)
+        expect(transport.logger).to respond_to(:error)
+        async_done
+      end
+    end
+  end
+
+  it "can set the redis transport logger" do
     async_wrapper do
       logger = Logger.new(STDOUT)
       Sensu::Transport.logger = logger
-      transport = Sensu::Transport.connect("rabbitmq")
-      expect(transport.logger).to eq(logger)
-      expect(transport.logger).to respond_to(:error)
-      async_done
+      Sensu::Transport.connect("redis") do |transport|
+        expect(transport.logger).to eq(logger)
+        expect(transport.logger).to respond_to(:error)
+        async_done
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-transport
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: em-redis-unified
+  name: sensu-redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="