logstash-codec-line 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84d9d0ba0a6de9a1bcde8b3c4e7953beaa055050
-  data.tar.gz: 5f3fbc68aa4fdf03ddf8d522f3736fbc1e7caba4
+  metadata.gz: 701c6951b1e5021efc5e76849dffd39d08b895d9
+  data.tar.gz: ff6c1850a1c0228f1607f207d3240f497ac6d21f
 SHA512:
-  metadata.gz: 85ebe2fbfcadfb52fed934e4ae9035686374d8ad7e128772cce69b650290f00fb77cc7402af17979b4c4698b940ab21c5153cbadca22645a53ea8fa58d7e9bfa
-  data.tar.gz: 551546a98206a72a99dd8ae5362b06989fc2ef0cb31676b6506cfa6d59ae1718061e0fd959896559af0290dda7606765e0512c53c32c417aa6376f84f0698e95
+  metadata.gz: d35c45d1f26991aa71eaac0f6b2179063fd3abfc598015bb2d1c097401f257b846c5cf12cf77683e4f6ca25bdf1e696cbc009f429c690881233b035b29c2e02a
+  data.tar.gz: 3c65173b48bfe947fcb9f269a21a49a542802883ebf5f0b7c6e6da934c4fa6c3346bc99b2dd76548b28691e471324865d7a8d5d34aa579f1e111c4d00bd819ae

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.1.0
+ - Support the customization of the delimiter through :delimiter option
+
 ## 2.0.0
  - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895

data/README.md

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

@@ -22,10 +22,13 @@ class LogStash::Codecs::Line < LogStash::Codecs::Base
   # This only affects "plain" format logs since json is `UTF-8` already.
   config :charset, :validate => ::Encoding.name_list, :default => "UTF-8"
 
+  # Change the delimiter that separates lines
+  config :delimiter, :validate => :string, :default => "\n"
+
   public
   def register
     require "logstash/util/buftok"
-    @buffer = FileWatch::BufferedTokenizer.new
+    @buffer = FileWatch::BufferedTokenizer.new(@delimiter)
     @converter = LogStash::Util::Charset.new(@charset)
     @converter.logger = @logger
   end
@@ -48,9 +51,9 @@ class LogStash::Codecs::Line < LogStash::Codecs::Base
   public
   def encode(event)
     if event.is_a? LogStash::Event and @format
-      @on_event.call(event, event.sprintf(@format) + NL)
+      @on_event.call(event, event.sprintf(@format) + @delimiter)
     else
-      @on_event.call(event, event.to_s + NL)
+      @on_event.call(event, event.to_s + @delimiter)
     end
   end # def encode
 

data/logstash-codec-line.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-line'
-  s.version         = '2.0.2'
+  s.version         = '2.1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Line-oriented text data."
   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/codecs/line_spec.rb

@@ -29,6 +29,20 @@ describe LogStash::Codecs::Line do
       end
       subject.encode(event)
     end
+
+    context "when using custom :delimiter" do
+      subject do
+        next LogStash::Codecs::Line.new("delimiter" => "|")
+      end
+
+      it "should append the delimiter to the line" do
+        expect(subject).to receive(:on_event).once.and_call_original
+        subject.on_event do |e, d|
+          insist {d} == event.to_s + "|"
+        end
+        subject.encode(event)
+      end
+    end
   end
 
   context "#decode" do
@@ -48,6 +62,31 @@ describe LogStash::Codecs::Line do
         insist { e["message"] } == "München"
       end
     end
+
+    context "when using custom :delimiter" do
+      subject do
+        next LogStash::Codecs::Line.new("delimiter" => "|")
+      end
+
+      it "should not break lines by '\n'" do
+        line = "line1\nline2\nline3\n"
+        result = []
+        subject.decode(line) { |e| result << e }
+        subject.flush { |e| result << e }
+        expect(result.size).to eq(1)
+        expect(result[0]["message"]).to eq(line)
+      end
+
+      it "should break lines by that delimiter" do
+        result = []
+        subject.decode("line1|line2|line3|") { |e| result << e }
+        subject.flush { |e| result << e }
+        expect(result.size).to eq(3)
+        expect(result[0]["message"]).to eq("line1")
+        expect(result[1]["message"]).to eq("line2")
+        expect(result[2]["message"]).to eq("line3")
+      end
+    end
   end
 
   context "#flush" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-line
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement