logstash-input-beats 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 233a88cd60c5306bc73c6577c146cdeb892d3cca
-  data.tar.gz: 3efc27b898d2da6f92cbbf6d8b0cca990c792bdc
+  metadata.gz: 7a9401d85a618195a338e8faaee3287c85b1414c
+  data.tar.gz: ef3cdd4de1c0fea567ff29b8f43037046f4421f0
 SHA512:
-  metadata.gz: baed97b8689d61e496b59cca3c4a31635fb967dc0501bcfdd1a67d3e43230a673f6580645086e0d6e2b278503cb6bd5035aed0c17cc9102d7afffccf5a775b61
-  data.tar.gz: ece3c51a188d149786d935bbf3d1a9f2cf7db83d5f9b5ac6dcc736c070f6a4c2cf497cb249e78bfdb85b6d38720ed47c6aabe139c767b0cfad1810338752aff5
+  metadata.gz: e92307aad4c185d634b0a4a41b732d88f0b8dceb50f23cbb55814e7bfde2ae1481e6de2a72b5aa71df81c297ac37856711e1653e5199b9ee725d8b4d768517d5
+  data.tar.gz: 74c5cc5071212c503c8ed1c054c400ea662304f793edddb7eb5f17d2b15b40b2d82d381d1c95cd81823590f592b16556299785b7362ddc35dd6d1039390cdd04

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.9.3
+  - Connection#run should rescue `Broken Pipe Error` #5
+  - Fix a `SystemCallErr` issue on windows when shutting down the server #9
+
 # 0.9.2
   - fix an issue with the incorrectly calculated ack when the window_size was smaller than the ACK_RATIO see  https://github.com/logstash-plugins/logstash-input-beats/issues/3
 

data/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
-gemspec
-gem "logstash-core", "2.0.0.beta3"
-# gem "logstash-core", "1.5.4"
+gemspec

data/README.md

@@ -1,5 +1,8 @@
 # Logstash Plugin
 
+[![Build
+Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-beats-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-beats-unit/)
+
 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.

data/lib/logstash/inputs/beats.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
+require "logstash/timestamp"
 require "logstash/compatibility_layer_api_v1"
 require "lumberjack/beats"
 require "lumberjack/beats/server"
@@ -127,20 +128,36 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
   private
   def create_event(codec, map)
     # Filebeats uses the `message` key and LSF `line`
-    target_field = map.delete(target_field_for_codec)
+    target_field = target_field_for_codec ? map.delete(target_field_for_codec) : nil
 
     if target_field.nil?
       return LogStash::Event.new(map)
     else
+
       # All codes expects to work on string
       @codec.decode(target_field.to_s) do |decoded|
         decorate(decoded)
+        ts = coerce_ts(map.delete("@timestamp"))
+        decoded["@timestamp"] = ts unless ts.nil?
         map.each { |k, v| decoded[k] = v }
         return decoded
       end
     end
   end
 
+  private
+  def coerce_ts(ts)
+    return nil if ts.nil?
+    timestamp = LogStash::Timestamp.coerce(ts)
+    return timestamp if timestamp
+
+    LOGGER.warn("Unrecognized @timestamp value, setting current time to @timestamp",
+      :value => ts.inspect)
+  rescue LogStash::TimestampParserError => e
+    LOGGER.warn("Error parsing @timestamp string, setting current time to @timestamp",
+      :value => ts.inspect, :exception => e.message)
+  end
+
   private
   def invoke(connection, codec, &block)
     @threadpool.post do

data/lib/lumberjack/beats/server.rb

@@ -314,9 +314,17 @@ module Lumberjack module Beats
       while !server.closed?
         read_socket(&block)
       end
-    rescue EOFError, OpenSSL::SSL::SSLError, IOError, Errno::ECONNRESET
+    rescue EOFError,
+      OpenSSL::SSL::SSLError,
+      IOError,
+      Errno::ECONNRESET,
+      Errno::EPIPE
       # EOF or other read errors, only action is to shutdown which we'll do in
       # 'ensure'
+    rescue
+      # when the server is shutting down we can safely ignore any exceptions
+      # On windows, we can get a `SystemCallErr`
+      raise unless server.closed?
     ensure
       close rescue 'Already closed stream'
     end # def run

data/logstash-input-beats.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = "logstash-input-beats"
-  s.version         = "0.9.2"
+  s.version         = "0.9.3"
   s.licenses        = ["Apache License (2.0)"]
   s.summary         = "Receive events using the lumberjack protocol."
   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/lumberjack/beats/connection_spec.rb

@@ -13,11 +13,12 @@ describe "Connnection" do
 
   context "when the server is running" do
     before do
-      expect(socket).to receive(:sysread).at_least(:once).with(Lumberjack::Beats::Connection::READ_SIZE).and_return("")
+      allow(socket).to receive(:sysread).with(Lumberjack::Beats::Connection::READ_SIZE).and_return("")
       allow(socket).to receive(:syswrite).with(anything).and_return(true)
       allow(socket).to receive(:close)
+    end
 
-
+    it "should ack the end of a sequence" do
       expectation = receive(:feed)
         .with("")
         .and_yield(:version, Lumberjack::Beats::Parser::PROTOCOL_VERSION_1)
@@ -26,16 +27,20 @@ describe "Connnection" do
       random_number_of_events.times { |n| expectation.and_yield(:data, start_sequence + n + 1, payload) }
 
       expect_any_instance_of(Lumberjack::Beats::Parser).to expectation
-    end
-
-    it "should ack the end of a sequence" do
       expect(socket).to receive(:syswrite).with(["1A", random_number_of_events + start_sequence].pack("A*N"))
       connection.read_socket
     end
+
+    it "should not ignore any exception raised by `#sysread`" do
+      expect(server).to receive(:closed?).and_return(false)
+      expect(connection).to receive(:read_socket).and_raise("Something went wrong")
+      expect { |b| connection.run(&b) }.to raise_error
+    end
   end
 
   context "when the server stop" do
     let(:server) { double("server", :closed? => true) }
+
     before do
       expect(socket).to receive(:close).and_return(true)
     end
@@ -43,5 +48,12 @@ describe "Connnection" do
     it "stop reading from the socket" do
       expect { |b| connection.run(&b) }.not_to yield_control
     end
+
+    it "should ignore any exception raised by `#sysread`" do
+      expect(server).to receive(:closed?).and_return(false)
+      expect(server).to receive(:closed?).and_return(true)
+      expect(connection).to receive(:read_socket).and_raise("Something went wrong")
+      expect { |b| connection.run(&b) }.not_to raise_error
+    end
   end
 end