logstash-input-redis 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe8520322379d9b3ca6330be6de34f9e6a34ecc8
-  data.tar.gz: d78576e44a2a2b55bc7abdb44ec2a149b150cfe5
+  metadata.gz: c8c722cb3bcfc1d78632ea7a35e37a44e257848c
+  data.tar.gz: 08243c568315e73608f6ad82478a08877c5b3fcf
 SHA512:
-  metadata.gz: 539f08d50eafd0d32ae3d3914c13e58a05e09028705f581cb930070c9d0c80ba136ccc08a13ec05204a56db5ce0797b0b8ebc151e1b0dc1684f02981fe510c85
-  data.tar.gz: 0e1725ef10c9926ec75cfca94d8a5c7e4aa38e6abb0bffb064ce9967b22f88b83e97b7f2bb13f2d2cf721e4e656b68afc66192879509d2646188fa9934a47f45
+  metadata.gz: 083e7c87a42cd7a899b53c81c79d13b19cea0cf78d54cb95a20a27e3ff088dee96c74d83b9eed341f58d2616c63310cae68b75d766746ac882511c8cca7fc6d4
+  data.tar.gz: eabba461cea36cd66b42074afe589e7ec95afa135dd4cae77986d8791e00d2ca7fab3b3771e548781da2ea384ff2937f512c3e376ca948f9ea7af15b653b2bd5

data/lib/logstash/inputs/redis.rb

@@ -133,23 +133,23 @@ 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);
+      @logger.error("Failed to create event", :message => msg, :exception => e, :backtrace => e.backtrace);
     end
   end
 
   private
   def list_listener(redis, output_queue)
 
+    item = redis.blpop(@key, 0, :timeout => 1)
+    return unless item # from timeout or other conditions
+
     # blpop returns the 'key' read from as well as the item result
     # we only care about the result (2nd item in the list).
-    item = redis.blpop(@key, 0)[1]
-
-    # blpop failed or .. something?
-    # TODO(sissel): handle the error
-    return if item.nil?
-    queue_event(item, output_queue)
+    queue_event(item[1], output_queue)
 
     # If @batch_count is 1, there's no need to continue.
     return if @batch_count == 1
@@ -222,7 +222,7 @@ EOF
   # loop.
   private
   def listener_loop(listener, output_queue)
-    while !finished?
+    while !@shutdown_requested
       begin
         @redis ||= connect
         self.send listener, @redis, output_queue
@@ -232,7 +232,7 @@ EOF
         @redis = nil
         sleep 1
       end
-    end # while !finished?
+    end
   end # listener_loop
 
   public
@@ -244,23 +244,25 @@ EOF
     else
       listener_loop :pattern_channel_listener, output_queue
     end
+  rescue LogStash::ShutdownSignal
+    # ignore and quit
   end # def run
 
   public
   def teardown
+    @shutdown_requested = true
+
     if @redis
       if @data_type == 'list'
-        @redis.quit
+        @redis.quit rescue nil
       elsif @data_type == 'channel'
-        @redis.unsubscribe
-        @redis.quit
+        @redis.unsubscribe rescue nil
+        @redis.connection.disconnect
       elsif @data_type == 'pattern_channel'
-        @redis.punsubscribe
-        @redis.quit
+        @redis.punsubscribe rescue nil
+        @redis.connection.disconnect
       end
+      @redis = nil
     end
-  rescue Redis::BaseError
-  ensure
-    @redis = nil
   end
 end # class LogStash::Inputs::Redis

data/logstash-input-redis.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-redis'
-  s.version         = '0.1.3'
+  s.version         = '0.1.4'
   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"

data/spec/inputs/redis_spec.rb

@@ -1,34 +1,35 @@
 require "logstash/devutils/rspec/spec_helper"
 require "redis"
+require "stud/try"
 
 def populate(key, event_count)
   require "logstash/event"
   redis = Redis.new(:host => "localhost")
   event_count.times do |value|
     event = LogStash::Event.new("sequence" => value)
-    Stud::try(10.times) do
+    Stud.try(10.times) do
       redis.rpush(key, event.to_json)
     end
   end
 end
 
-def process(pipeline, queue, event_count)
-  sequence = 0
-  Thread.new { pipeline.run }
-  event_count.times do |i|
-    event = queue.pop
+def process(conf, event_count)
+  events = input(conf) do |pipeline, queue|
+    event_count.times.map{queue.pop}
+  end
+
+  events.each_with_index do |event, i|
     insist { event["sequence"] } == i
   end
-  pipeline.shutdown
 end # process
 
 describe "inputs/redis", :redis => true do
-  
 
-  describe "read events from a list" do
+  it "should read events from a list" do
     key = 10.times.collect { rand(10).to_s }.join("")
     event_count = 1000 + rand(50)
-    config <<-CONFIG
+    # event_count = 100
+    conf = <<-CONFIG
       input {
         redis {
           type => "blah"
@@ -38,15 +39,14 @@ describe "inputs/redis", :redis => true do
       }
     CONFIG
 
-    before(:each) { populate(key, event_count) }
-
-    input { |pipeline, queue| process(pipeline, queue, event_count) }
+    populate(key, event_count)
+    process(conf, event_count)
   end
 
-  describe "read events from a list with batch_count=5" do
+  it "should read events from a list using batch_count" do
     key = 10.times.collect { rand(10).to_s }.join("")
     event_count = 1000 + rand(50)
-    config <<-CONFIG
+    conf = <<-CONFIG
       input {
         redis {
           type => "blah"
@@ -57,7 +57,7 @@ describe "inputs/redis", :redis => true do
       }
     CONFIG
 
-    before(:each) { populate(key, event_count) }
-    input { |pipeline, queue| process(pipeline, queue, event_count) }
+    populate(key, event_count)
+    process(conf, event_count)
   end
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-redis
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,48 +28,50 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  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'
   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@elasticsearch.com
 executables: []
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: This input will read events from a Redis instance