fluent-plugin-elb-access-log 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48b23acb9715aceaba32535f3ee24da9c672e1e0
-  data.tar.gz: 161ce0f55e79b042af34171060d3e4d611f6acdb
+  metadata.gz: c7fc100990f59fc2792cbf0506b75ef400a1dd8f
+  data.tar.gz: 9e6bda33e638700957ee92c685c699859eb4dfab
 SHA512:
-  metadata.gz: a9542814648731d30041c6bf7c9c30bfd822d3be137429628c2eb77aae0f02a7aeda538090065f5be6825cef415c1d60b18e62c07ea3b8edd3623d5be522a03f
-  data.tar.gz: db0422ee4c1b5478eca4ee1531ae947685eb8584942ff264646dfa918147cce605b54625cb69e005caa90910819550a963d5adc8f8377bffa292546c31f71cb9
+  metadata.gz: f280a3e9212f18ce0446daacd6fffb6d9d3e59413458e3f6052acd240523a5c2db8d42ea2d73ed53f90fbc51abe554edc13c73eca2414c65bd8661839c6579a5
+  data.tar.gz: 26eb2f804a5245738cb6e7881ba3d454457ec3f575d8acc9d1b200da402f38a82eba0d263f0e42f4706dfeac18b3fcc62e50d40425c67b342c4cde93b5fa66e3

data/fluent-plugin-elb-access-log.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'fluentd', '>= 0.14'
   spec.add_dependency 'aws-sdk-s3', '~> 1.8'
   spec.add_dependency 'addressable'
+  spec.add_dependency 'multiple_files_gzip_reader'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'

data/lib/fluent/plugin/in_elb_access_log.rb

@@ -4,7 +4,7 @@ require 'logger'
 require 'time'
 require 'addressable/uri'
 require 'aws-sdk-s3'
-require 'zlib'
+require 'multiple_files_gzip_reader'
 
 require 'fluent/input'
 require 'fluent_plugin_elb_access_log/version'
@@ -166,13 +166,17 @@ class Fluent::Plugin::ElbAccessLogInput < Fluent::Input
 
             if obj.key.end_with?('.gz')
               begin
-                access_log = Zlib::GzipReader.wrap(access_log, &:read)
+                access_log = MultipleFilesGzipReader.new(access_log)
+
+                # check gzip formta
+                access_log.first
+                access_log.rewind
               rescue Zlib::Error => e
                 @log.warn("#{e.message}: #{access_log.inspect.slice(0, 64)}")
                 next
               end
             else
-              access_log = access_log.string
+              access_log = access_log.each_line
             end
 
             emit_access_log(access_log)
@@ -216,7 +220,9 @@ class Fluent::Plugin::ElbAccessLogInput < Fluent::Input
   def parse_log(access_log)
     parsed_access_log = []
 
-    access_log.split("\n").each do |line|
+    access_log.each do |line|
+      line.chomp!
+
       case @elb_type
       when 'clb'
         line = parse_clb_line(line)
@@ -313,7 +319,7 @@ class Fluent::Plugin::ElbAccessLogInput < Fluent::Input
   end
 
   def sampling(access_log)
-    access_log.split("\n").each_with_index.select {|row, i| (i % @sampling_interval).zero? }.map {|row, i| row }.join("\n")
+    access_log.each_with_index.select {|_, i| (i % @sampling_interval).zero? }.map(&:first)
   end
 
   def split_address_port!(record, prefix)

data/lib/fluent_plugin_elb_access_log/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginElbAccessLog
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elb-access-log
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Genki Sugawara
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multiple_files_gzip_reader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement