logstash-codec-json_lines 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f521208069a7cd36106fb98b084d514e09ee87f
-  data.tar.gz: 4be461209d267a74a8ba35904f6f819493c8c466
+  metadata.gz: 313c69ada5cae85d4921a4bb4d40966784a34eb4
+  data.tar.gz: f6e4543df04605d602fd8df5bb296877ca792e43
 SHA512:
-  metadata.gz: 97921e4feed4e57da139aa12b6a29d00f0430ecf19bf6b4c94fd46ca03db3c1c5430b63a26b22de5b83c47eca4d81749232bad2675e6e4a84d026385f612f41f
-  data.tar.gz: bd9480c4584eb40ea9b1218821cf53ac6de56e61f50c47a158476353300239d89280292f4cac31f21c3e4e0ade204c363d15e8e3ecaca3fa2915493c326d9512
+  metadata.gz: 9c6cfe1bbd4c7683077f2f8819211a0a9c78ae2a16e43d787c3155dd3ab8a9c6ca6f7b8c280d5f67159c73b3553590fbc47ca03b4c91d91c083370aab7021ce8
+  data.tar.gz: 3aaa57ac5fa0adff86f2c1eeaef369904f7932eb16704c66d3da4563c3d0bb532c00be38c9fe6374826038acba83c19e40d482d0b20270b687e2f8e359019d1c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.5
+ - Directly use buftok to avoid indirection through the line codec https://github.com/logstash-plugins/logstash-codec-json_lines/pull/18
+
 ## 2.0.4
  - Support for customizable delimiter
 

data/lib/logstash/codecs/json_lines.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "logstash/codecs/base"
-require "logstash/codecs/line"
+require "logstash/util/charset"
+require "logstash/util/buftok"
 require "logstash/json"
 
 # This codec will decode streamed JSON that is newline delimited.
@@ -13,7 +14,6 @@ require "logstash/json"
 class LogStash::Codecs::JSONLines < LogStash::Codecs::Base
   config_name "json_lines"
 
-
   # The character encoding used in this codec. Examples include `UTF-8` and
   # `CP1252`
   #
@@ -30,15 +30,15 @@ class LogStash::Codecs::JSONLines < LogStash::Codecs::Base
 
   public
 
-  def initialize(params={})
-    super(params)
-    @lines = LogStash::Codecs::Line.new("delimiter" => @delimiter)
-    @lines.charset = @charset
+  def register
+    @buffer = FileWatch::BufferedTokenizer.new(@delimiter)
+    @converter = LogStash::Util::Charset.new(@charset)
+    @converter.logger = @logger
   end
 
   def decode(data)
-    @lines.decode(data) do |event|
-      yield guard(event, data)
+    @buffer.extract(data).each do |line|
+      yield guard(@converter.convert(line))
     end
   end # def decode
 
@@ -50,11 +50,11 @@ class LogStash::Codecs::JSONLines < LogStash::Codecs::Base
 
   private
 
-  def guard(event, data)
+  def guard(data)
     begin
-      LogStash::Event.new(LogStash::Json.load(event["message"]))
+      LogStash::Event.new(LogStash::Json.load(data))
     rescue LogStash::Json::ParserError => e
-      LogStash::Event.new("message" => event["message"], "tags" => ["_jsonparsefailure"])
+      LogStash::Event.new("message" => data, "tags" => ["_jsonparsefailure"])
     end
   end
 

data/logstash-codec-json_lines.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-json_lines'
-  s.version         = '2.0.4'
+  s.version         = '2.0.5'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This codec will decode streamed JSON that is newline delimited."
   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"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
+  s.files = Dir['lib/**/*','spec/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})

data/spec/codecs/json_lines_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "logstash/codecs/json_lines"
 require "logstash/event"
 require "logstash/json"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-json_lines
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core