logstash-mixin-rabbitmq_connection 1.0.0.beta1-java → 1.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be261e8112ff1e011b6191a7440ae5cb8850220b
-  data.tar.gz: cd9acfffc0d2ead393dc9c952373bba3d663e52b
+  metadata.gz: b9f2be467b6cb31ac7b0a07be959aabb08f7579c
+  data.tar.gz: ebf161c2d0bd8f40136ce42bbfc5cb7d113df268
 SHA512:
-  metadata.gz: ca50bdcf451390ee94103af05253eecb613b96ae5872e0f893e68cb7dce684c8d3fd9e62ba207d6ce5456be18e532a4bbb58e740d143377a976241309f92e1ae
-  data.tar.gz: b552fae802db33fbf7ff6a4b79d22149c27dda4942acb71b4eaeb5111d6ebd2f7eb0d29732b24d1275196bc54b6377e9ccb0acb36526a31f7591de8e44fb147b
+  metadata.gz: f4fbd248d78808dee29026165e4b0a0693c2a878d63c33f5eb820a8b2e9c595ee444e38c8f7994588b5986b87c638dc4306007723b037101c6711e160392e4b7
+  data.tar.gz: 45c4612daca350ecfbc75ef4c706d921211f617388120ac43d5a470bb1a632fc2463174ee7db1bb754a1ec1d932d0d1ff169e91332916f99ce27450c7b806b50

data/lib/logstash/plugin_mixins/rabbitmq_connection.rb

@@ -54,18 +54,16 @@ module LogStash
         # Extra queue arguments as an array.
         # To make a RabbitMQ queue mirrored, use: `{"x-ha-policy" => "all"}`
         config :arguments, :validate => :array, :default => {}
-
       end
 
       def conn_str
         "amqp://#{@user}@#{@host}:#{@port}#{@vhost}"
       end
 
-      def teardown
+      def close_connection
+        @rabbitmq_connection_stopping = true
         @hare_info.channel.close if channel_open?
         @hare_info.connection.close if connection_open?
-
-        finished
       end
 
       def rabbitmq_settings
@@ -86,8 +84,6 @@ module LogStash
       def connect!
         @hare_info = connect() unless @hare_info # Don't duplicate the conn!
       rescue MarchHare::Exception => e
-        return if terminating?
-
         @logger.error("RabbitMQ connection error, will retry.",
                       :message => e.message,
                       :exception => e.class.name,
@@ -113,10 +109,10 @@ module LogStash
       private
 
       def declare_exchange!(channel, exchange, exchange_type, durable)
-        @logger.debug("Declaring an exchange", :name => exchange,
+        @logger.debug? && @logger.debug("Declaring an exchange", :name => exchange,
                       :type => exchange_type, :durable => durable)
         exchange = channel.exchange(exchange, :type => exchange_type.to_sym, :durable => durable)
-        @logger.debug("Exchange declared")
+        @logger.debug? && @logger.debug("Exchange declared")
         exchange
       rescue StandardError => e
         @logger.error("Could not declare exchange!",
@@ -140,7 +136,7 @@ module LogStash
       end
 
       def sleep_for_retry
-        sleep @connect_retry_interval
+        Stud.stoppable_sleep(@connect_retry_interval) { @rabbitmq_connection_stopping }
       end
     end
   end

data/logstash-mixin-rabbitmq_connection.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-mixin-rabbitmq_connection'
-  s.version         = '1.0.0.beta1'
+  s.version         = '1.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Common functionality for RabbitMQ plugins"
   s.description     = "This is used to provide configuration options and connection settings for logstash plugins working with RabbitMQ"
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   s.platform = RUBY_PLATFORM
   s.add_runtime_dependency 'march_hare', ['~> 2.11.0'] #(MIT license)
+  s.add_runtime_dependency 'stud', '~> 0.0.22'
 
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'logstash-input-generator'

data/spec/plugin_mixins/rabbitmq_connection_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/pipeline"
 require "logstash/plugin_mixins/rabbitmq_connection"
@@ -99,4 +100,4 @@ describe LogStash::PluginMixins::RabbitMQConnection do
       expect(subject).to have_received(:sleep_for_retry).once
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-rabbitmq_connection
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.22
+  name: stud
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.22
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -113,9 +127,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.8