logstash-input-relp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2148057f735b2a5edb327beff5d106602dad57c9
-  data.tar.gz: 04537891291c2c4d367544459da01a09103ca092
+  metadata.gz: 3f136b2ae376bb7219926bbb97ea97be2314757a
+  data.tar.gz: 0aa28fa74ee6ceba4e3713e488d971d8fe1c2cde
 SHA512:
-  metadata.gz: 2177fd80b7ed5854bdbd8c0f3709edaf11a82c78e5cd9b47af49b1ca8f3d71414732e5dec029180c46bacf2be0303d6061dfa4f59f712539b39c6927d504ec03
-  data.tar.gz: 5bb0e0b254571216fa0553e6e24627bc9304c54ed1b4a9e1c98e7dc14c7446c9a391e1efb854e0c34d715fae3fdf0c205f4b616b7d4a1e4793d590496d53904e
+  metadata.gz: 7d3a95308a7672189db3c7e828f2036f87a146da7810ebbf32d6ed8bf13909ded0db77391f38a6cb9d57d8c625e87ba40d450b9084a4df7de3dbbcaf0bc0ee9e
+  data.tar.gz: 6884706af0e0574ef7257a3fb65cd70d593d510eaf3faaebf79ba7902aa3266740b29ee0d24e189bb565f4c5da77d2102f9b720182cddac4a2647561f9bc42f7

data/lib/logstash/inputs/relp.rb

@@ -8,7 +8,7 @@ require "logstash/util/socket_peer"
 
 # Read RELP events over a TCP socket.
 #
-# For more information about RELP, see 
+# For more information about RELP, see
 # <http://www.rsyslog.com/doc/imrelp.html>
 #
 # This protocol implements application-level acknowledgements to help protect
@@ -17,8 +17,6 @@ require "logstash/util/socket_peer"
 # Message acks only function as far as messages being put into the queue for
 # filters; anything lost after that point will not be retransmitted
 class LogStash::Inputs::Relp < LogStash::Inputs::Base
-  class Interrupted < StandardError; end
-
   config_name "relp"
 
   default :codec, "plain"
@@ -31,6 +29,8 @@ class LogStash::Inputs::Relp < LogStash::Inputs::Base
 
   def initialize(*args)
     super(*args)
+    @interrupted = false
+    @relp_server = nil
   end # def initialize
 
   public
@@ -49,7 +49,7 @@ class LogStash::Inputs::Relp < LogStash::Inputs::Base
         output_queue << event
       end
 
-      #To get this far, the message must have made it into the queue for 
+      #To get this far, the message must have made it into the queue for
       #filtering. I don't think it's possible to wait for output before ack
       #without fundamentally breaking the plugin architecture
       relpserver.ack(socket, frame['txnr'])
@@ -59,7 +59,7 @@ class LogStash::Inputs::Relp < LogStash::Inputs::Base
   public
   def run(output_queue)
     @thread = Thread.current
-    loop do
+    while !@interrupted
       begin
         # Start a new thread for each connection.
         Thread.start(@relp_server.accept) do |client|
@@ -87,22 +87,22 @@ class LogStash::Inputs::Relp < LogStash::Inputs::Base
         @logger.warn('Relp client trying to open connection with something other than open:'+e.message)
       rescue Relp::InsufficientCommands
         @logger.warn('Relp client incapable of syslog')
-      rescue IOError, Interrupted
-        if @interrupted
-          # Intended shutdown, get out of the loop
-          @relp_server.shutdown
-          break
-        else
-          # Else it was a genuine IOError caused by something else, so propagate it up..
-          raise
-        end
+      rescue IOError
+        break if @interrupted
+        raise
+      rescue LogStash::ShutdownSignal
+        @interrupted = true
+        break
       end
     end # loop
   end # def run
 
   def teardown
     @interrupted = true
-    @thread.raise(Interrupted.new)
+    if @relp_server
+      @relp_server.shutdown rescue nil
+      @relp_server = nil
+    end
   end
 end # class LogStash::Inputs::Relp
 

data/logstash-input-relp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-relp'
-  s.version         = '0.1.3'
+  s.version         = '0.1.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read RELP events over a TCP socket."
   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/relp_spec.rb

@@ -3,12 +3,12 @@ require "logstash/devutils/rspec/spec_helper"
 require "socket"
 require "logstash/util/relp"
 
-describe "inputs/relp", :socket => true do
+describe "inputs/relp" do
 
-  describe "Single client connection" do
+  it "should do single client connection" do
     event_count = 10
     port = 5511
-    config <<-CONFIG
+    conf = <<-CONFIG
     input {
       relp {
         type => "blah"
@@ -17,29 +17,23 @@ describe "inputs/relp", :socket => true do
     }
     CONFIG
 
-    input do |pipeline, queue|
-      th = Thread.new { pipeline.run }
-      sleep 0.1 while !pipeline.ready?
-
-      #Send events from clients
+    events = input(conf) do |pipeline, queue|
       client = RelpClient.new("0.0.0.0", port, ["syslog"])
       event_count.times do |value|
         client.syslog_write("Hello #{value}")
       end
+      event_count.times.collect { queue.pop }
+    end
 
-      events = event_count.times.collect { queue.pop }
-      event_count.times do |i|
-        insist { events[i]["message"] } == "Hello #{i}"
-      end
-
-      pipeline.shutdown
-      th.join
-    end # input
+    event_count.times do |i|
+      insist { events[i]["message"] } == "Hello #{i}"
+    end
   end
-  describe "Two client connection" do
+
+  it "should do two client connection" do
     event_count = 100
     port = 5512
-    config <<-CONFIG
+    conf = <<-CONFIG
     input {
       relp {
         type => "blah"
@@ -48,22 +42,19 @@ describe "inputs/relp", :socket => true do
     }
     CONFIG
 
-    input do |pipeline, queue|
-      Thread.new { pipeline.run }
-      sleep 0.1 while !pipeline.ready?
-
-      #Send events from clients sockets
+    events = input(conf) do |pipeline, queue|
       client = RelpClient.new("0.0.0.0", port, ["syslog"])
       client2 = RelpClient.new("0.0.0.0", port, ["syslog"])
 
-      event_count.times do |value|
+      event_count.times do
         client.syslog_write("Hello from client")
         client2.syslog_write("Hello from client 2")
       end
 
-      events = (event_count*2).times.collect { queue.pop }
-      insist { events.select{|event| event["message"]=="Hello from client" }.size } == event_count
-      insist { events.select{|event| event["message"]=="Hello from client 2" }.size } == event_count
-    end # input
+      (event_count * 2).times.map{queue.pop}
+    end
+
+    insist { events.select{|event| event["message"] == "Hello from client" }.size } == event_count
+    insist { events.select{|event| event["message"] == "Hello from client 2" }.size } == event_count
   end
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-relp
 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,34 +28,36 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
+  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-plain
   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: []
@@ -96,7 +96,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: Read RELP events over a TCP socket.