logstash-input-redis 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68987e0aa7d18a5e26559e24b54f8e96a786925a
-  data.tar.gz: 72ce8f6a4031705347a35dacc4b5ec159c376465
+  metadata.gz: 9e5f594df8d7088bee997d66a0e95d7127cbcb0d
+  data.tar.gz: d7351c9c24266e975fe1e39480fb6d9e7f4799f8
 SHA512:
-  metadata.gz: 180e9f98e97607f38f505b95b4939106795ae8c9280ef7a6cb5b6eaf0e958612609de629141fc9553fdaedfae4111b13488478f6dfe14170f6fcf525cc832ce2
-  data.tar.gz: d2b0ae3f31e7e51eda007b62df6032ff015ffcc850cead2d65d78ea3beebb59b895ec7b060c967d7cd0a3f9badb42cde91a9cf8838fe2a19ba424d3f427b2038
+  metadata.gz: e4456f8d6cc3fce7ff155bc7356f97b7f0217a2a3f8a4ea0d0d801f0ffc680f39011b449bc2fcfe7e93cf374409bc7f0b55b0ac0077c823fbdc7538d24281813
+  data.tar.gz: 0dea51a35971a3db1127cf39ba1b9fcc8e8b82fbaaf6ca8615935ded25ae8a07501d80dc1d500daab8b0d2992d61e96f90d5c782566417e18e81122bdf708f96

data/README.md

@@ -1,15 +1,15 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/inputs/redis.rb

@@ -103,13 +103,13 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
     # just switch on data_type once
     if @data_type == 'list' || @data_type == 'dummy'
       @run_method = method(:list_runner)
-      @teardown_method = method(:list_teardown)
+      @stop_method = method(:list_stop)
     elsif @data_type == 'channel'
       @run_method = method(:channel_runner)
-      @teardown_method = method(:subscribe_teardown)
+      @stop_method = method(:subscribe_stop)
     elsif @data_type == 'pattern_channel'
       @run_method = method(:pattern_channel_runner)
-      @teardown_method = method(:subscribe_teardown)
+      @stop_method = method(:subscribe_stop)
     end
 
     # TODO(sissel, boertje): set @identity directly when @name config option is removed.
@@ -123,9 +123,8 @@ module LogStash module Inputs class Redis < LogStash::Inputs::Threadable
     # ignore and quit
   end # def run
 
-  def teardown
-    @shutdown_requested = true
-    @teardown_method.call
+  def stop
+    @stop_method.call
   end
 
   # private methods -----------------------------
@@ -192,26 +191,13 @@ EOF
         decorate(event)
         output_queue << event
       end
-    rescue LogStash::ShutdownSignal => e
-      # propagate up
-      raise(e)
     rescue => e # parse or event creation error
       @logger.error("Failed to create event", :message => msg, :exception => e, :backtrace => e.backtrace);
     end
   end
 
   # private
-  def shutting_down?
-    @shutdown_requested
-  end
-
-  # private
-  def running?
-    !@shutdown_requested
-  end
-
-  # private
-  def list_teardown
+  def list_stop
     return if @redis.nil? || !@redis.connected?
 
     @redis.quit rescue nil
@@ -220,7 +206,7 @@ EOF
 
   # private
   def list_runner(output_queue)
-    while running?
+    while !stop?
       begin
         @redis ||= connect
         list_listener(@redis, output_queue)
@@ -228,6 +214,8 @@ EOF
         @logger.warn("Redis connection problem", :exception => e)
         # Reset the redis variable to trigger reconnect
         @redis = nil
+        # this sleep does not need to be stoppable as its
+        # in a while !stop? loop
         sleep 1
       end
     end
@@ -277,7 +265,7 @@ EOF
   end
 
   # private
-  def subscribe_teardown
+  def subscribe_stop
     return if @redis.nil? || !@redis.connected?
     # if its a SubscribedClient then:
     # it does not have a disconnect method (yet)
@@ -298,8 +286,8 @@ EOF
       @logger.warn("Redis connection problem", :exception => e)
       # Reset the redis variable to trigger reconnect
       @redis = nil
-      sleep 1
-      retry
+      Stud.stoppable_sleep(1) { stop? }
+      retry if !stop?
     end
   end
 

data/logstash-input-redis.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-redis'
-  s.version         = '1.0.3'
+  s.version         = '2.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This input will read events from a Redis instance"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
 
   s.add_runtime_dependency 'logstash-codec-json'
   s.add_runtime_dependency 'redis'

data/spec/inputs/redis_spec.rb

@@ -78,7 +78,8 @@ describe LogStash::Inputs::Redis do
   let(:accumulator) { [] }
 
   subject do
-    described_class.new(cfg).add_external_redis_builder(builder)
+    LogStash::Plugin.lookup("input", "redis")
+      .new(cfg).add_external_redis_builder(builder)
   end
 
   context 'construction' do
@@ -92,7 +93,7 @@ describe LogStash::Inputs::Redis do
       subject.register
     end
 
-    context 'teardown when redis is unset' do
+    context 'close when redis is unset' do
       let(:quit_calls) { [:quit, :unsubscribe, :punsubscribe, :connection, :disconnect!] }
 
       it 'does not attempt to quit' do
@@ -100,7 +101,7 @@ describe LogStash::Inputs::Redis do
         quit_calls.each do |call|
           expect(redis).not_to receive(call)
         end
-        expect {subject.teardown}.not_to raise_error
+        expect {subject.do_stop}.not_to raise_error
       end
     end
 
@@ -112,7 +113,7 @@ describe LogStash::Inputs::Redis do
 
       tt = Thread.new do
         sleep 0.01
-        subject.teardown
+        subject.do_stop
       end
 
       subject.run(accumulator)
@@ -122,7 +123,7 @@ describe LogStash::Inputs::Redis do
       expect(accumulator.size).to be > 0
     end
 
-    it 'multiple teardown calls, calls to redis once' do
+    it 'multiple close calls, calls to redis once' do
       subject.use_redis(redis)
       allow(redis).to receive(:blpop).and_return(['foo', 'l1'])
       expect(redis).to receive(:connected?).and_return(connected.last)
@@ -130,10 +131,10 @@ describe LogStash::Inputs::Redis do
         expect(redis).to receive(call).at_most(:once)
       end
 
-      subject.teardown
+      subject.do_stop
       connected.push(false) #can't use let block here so push to array
-      expect {subject.teardown}.not_to raise_error
-      subject.teardown
+      expect {subject.do_stop}.not_to raise_error
+      subject.do_stop
     end
   end
 
@@ -153,11 +154,11 @@ describe LogStash::Inputs::Redis do
       end
     end
 
-    def teardown_thread(inst, rt)
+    def close_thread(inst, rt)
       Thread.new(inst, rt) do |subj, runner|
         sleep 0.4 # allow the messages through
         runner.raise(LogStash::ShutdownSignal)
-        subj.teardown
+        subj.close
       end
     end
 
@@ -188,11 +189,11 @@ describe LogStash::Inputs::Redis do
       let(:quit_calls) { [:unsubscribe, :connection] }
 
       context 'mocked redis' do
-        it 'multiple teardown calls, calls to redis once', type: :mocked do
-          subject.teardown
+        it 'multiple stop calls, calls to redis once', type: :mocked do
+          subject.do_stop
           connected.push(false) #can't use let block here so push to array
-          expect {subject.teardown}.not_to raise_error
-          subject.teardown
+          expect {subject.do_stop}.not_to raise_error
+          subject.do_stop
         end
       end
 
@@ -203,7 +204,7 @@ describe LogStash::Inputs::Redis do
           #simulate the other system thread
           publish_thread(instance.new_redis_instance, 'c').join
           #simulate the pipeline thread
-          teardown_thread(instance, rt).join
+          close_thread(instance, rt).join
 
           expect(accumulator.size).to eq(2)
         end
@@ -215,11 +216,11 @@ describe LogStash::Inputs::Redis do
       let(:quit_calls) { [:punsubscribe, :connection] }
 
       context 'mocked redis' do
-        it 'multiple teardown calls, calls to redis once', type: :mocked do
-          subject.teardown
+        it 'multiple stop calls, calls to redis once', type: :mocked do
+          subject.do_stop
           connected.push(false) #can't use let block here so push to array
-          expect {subject.teardown}.not_to raise_error
-          subject.teardown
+          expect {subject.do_stop}.not_to raise_error
+          subject.do_stop
         end
       end
 
@@ -230,7 +231,7 @@ describe LogStash::Inputs::Redis do
           #simulate the other system thread
           publish_thread(instance.new_redis_instance, 'pc').join
           #simulate the pipeline thread
-          teardown_thread(instance, rt).join
+          close_thread(instance, rt).join
 
           expect(accumulator.size).to eq(2)
         end
@@ -238,4 +239,9 @@ describe LogStash::Inputs::Redis do
     end
   end
 
+  describe LogStash::Inputs::Redis do
+    it_behaves_like "an interruptible input plugin" do
+      let(:config) { {'key' => 'foo', 'data_type' => 'list'} }
+    end
+  end
 end

metadata

@@ -1,91 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-redis
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.0.snapshot
+  name: logstash-core
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.snapshot
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-codec-json
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: redis
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: redis
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/inputs/redis.rb
 - logstash-input-redis.gemspec
 - spec/inputs/redis_spec.rb
@@ -111,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: This input will read events from a Redis instance

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"