logstash-input-relp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d0323291b86235dd9671fbf57aff651fb361eff
-  data.tar.gz: a1ca8d2de0b2a9918279674dcfc366d20dbad1aa
+  metadata.gz: 2148057f735b2a5edb327beff5d106602dad57c9
+  data.tar.gz: 04537891291c2c4d367544459da01a09103ca092
 SHA512:
-  metadata.gz: 388e5d35e7f5ed3eb7cd8f3afc2ac42ac9e4a715b73284bcd8f4801329b3692403ba755d4e33ebce84c9448383c9f57f229220d471e621dd6f501e9737f4f1d9
-  data.tar.gz: 01ef4b813d3b301c1b3cb223811737c9d663dc78e2c525068159b9ce137963243804f93f8dcb3366d465f195e784702db6a0760eb48d6c1271df2bf1da43d8ce
+  metadata.gz: 2177fd80b7ed5854bdbd8c0f3709edaf11a82c78e5cd9b47af49b1ca8f3d71414732e5dec029180c46bacf2be0303d6061dfa4f59f712539b39c6927d504ec03
+  data.tar.gz: 5bb0e0b254571216fa0553e6e24627bc9304c54ed1b4a9e1c98e7dc14c7446c9a391e1efb854e0c34d715fae3fdf0c205f4b616b7d4a1e4793d590496d53904e

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
-gemspec
-gem "logstash", :github => "elasticsearch/logstash", :branch => "1.5"
+gemspec

data/README.md

@@ -22,7 +22,7 @@ Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com
 #### Code
 - To get started, you'll need JRuby with the Bundler gem installed.
 
-- Create a new plugin or clone and existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization.
+- Create a new plugin or clone and existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization. We also provide [example plugins](https://github.com/logstash-plugins?query=example).
 
 - Install dependencies
 ```sh
@@ -31,26 +31,15 @@ bundle install
 
 #### Test
 
-```sh
-bundle exec rspec
-```
+- Update your dependencies
 
-The Logstash code required to run the tests/specs is specified in the `Gemfile` by the line similar to:
-```ruby
-gem "logstash", :github => "elasticsearch/logstash", :branch => "1.5"
-```
-To test against another version or a local Logstash, edit the `Gemfile` to specify an alternative location, for example:
-```ruby
-gem "logstash", :github => "elasticsearch/logstash", :ref => "master"
-```
-```ruby
-gem "logstash", :path => "/your/local/logstash"
+```sh
+bundle install
 ```
 
-Then update your dependencies and run your tests:
+- Run tests
 
 ```sh
-bundle install
 bundle exec rspec
 ```
 
@@ -58,13 +47,13 @@ bundle exec rspec
 
 #### 2.1 Run in a local Logstash clone
 
-- Edit Logstash `tools/Gemfile` and add the local plugin path, for example:
+- Edit Logstash `Gemfile` and add the local plugin path, for example:
 ```ruby
 gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
 ```
-- Update Logstash dependencies
+- Install plugin
 ```sh
-rake vendor:gems
+bin/plugin install --no-verify
 ```
 - Run Logstash with your plugin
 ```sh
@@ -74,6 +63,8 @@ At this point any modifications to the plugin code will be applied to this local
 
 #### 2.2 Run in an installed Logstash
 
+You can use the same **2.1** method to run your plugin in an installed Logstash by editing its `Gemfile` and pointing the `:path` to your local plugin development directory or you can build the gem and install it using:
+
 - Build your plugin gem
 ```sh
 gem build logstash-filter-awesome.gemspec
@@ -90,6 +81,6 @@ All contributions are welcome: ideas, patches, documentation, bug reports, compl
 
 Programming is not a required skill. Whatever you've seen about open source and maintainers or community members  saying "send patches or die" - you will not see that here.
 
-It is more important to me that you are able to contribute.
+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/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/inputs/relp.rb

@@ -65,11 +65,12 @@ class LogStash::Inputs::Relp < LogStash::Inputs::Base
         Thread.start(@relp_server.accept) do |client|
             rs = client[0]
             socket = client[1]
+          begin
+            rs.relp_setup_connection(socket)
             # monkeypatch a 'peer' method onto the socket.
             socket.instance_eval { class << self; include ::LogStash::Util::SocketPeer end }
             peer = socket.peer
             @logger.debug("Relp Connection to #{peer} created")
-          begin
             relp_stream(rs,socket, output_queue, peer)
           rescue Relp::ConnectionClosed => e
             @logger.debug("Relp Connection to #{peer} Closed")
@@ -78,6 +79,8 @@ class LogStash::Inputs::Relp < LogStash::Inputs::Base
             #TODO: Still not happy with this, are they all warn level?
             #Will this catch everything I want it to?
             #Relp spec says to close connection on error, ensure this is the case
+          ensure
+            socket.close rescue nil
           end
         end # Thread.start
       rescue Relp::InvalidCommand,Relp::InappropriateCommand => e

data/lib/logstash/util/relp.rb

@@ -10,6 +10,7 @@ class Relp#This isn't much use on its own, but gives RelpServer and RelpClient t
   class InvalidCommand < RelpError; end
   class InappropriateCommand < RelpError; end
   class ConnectionClosed < RelpError; end
+  class FrameReadException < RelpError; end
   class InsufficientCommands < RelpError; end
 
   def valid_command?(command)
@@ -75,8 +76,10 @@ class Relp#This isn't much use on its own, but gives RelpServer and RelpClient t
         frame['message'] = socket.read(frame['datalen'])
       end
       @logger.debug? and @logger.debug("Read frame", :frame => frame)
-    rescue EOFError,Errno::ECONNRESET,IOError
+    rescue Errno::ECONNRESET
       raise ConnectionClosed
+    rescue EOFError,IOError
+      raise FrameReadException
     end
     if ! self.valid_command?(frame['command'])#TODO: is this enough to catch framing errors?
       if self.server?
@@ -120,6 +123,11 @@ class RelpServer < Relp
 
   def accept
     socket = @server.accept
+    @logger.debug("New socket created")
+    return self, socket
+  end
+
+  def relp_setup_connection(socket)
     frame=self.frame_read(socket)
     if frame['command'] == 'open'
       offer=Hash[*frame['message'].scan(/^(.*)=(.*)$/).flatten]
@@ -153,7 +161,6 @@ class RelpServer < Relp
         response_frame['message'] += 'relp_software=' + RelpSoftware + "\n"
         response_frame['message'] += 'commands=' + @required_relp_commands.join(',')#TODO: optional ones
         self.frame_write(socket, response_frame)
-        return self, socket
       end
     else
       self.serverclose(socket)

data/logstash-input-relp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-relp'
-  s.version         = '0.1.2'
+  s.version         = '0.1.3'
   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"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency 'logstash', '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
 
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_development_dependency 'logstash-devutils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-relp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -19,7 +19,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash
+  name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Read RELP events over a TCP socket.