fluent-plugin-buffer-event_limited 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de3aaaafca6b7e849146aa11137d8925c79621ad
-  data.tar.gz: 3089551096e1a8b3f203492d37e275c6167d52bb
+  metadata.gz: d9837aeb9ac272dabafad51da6d4e94209894cb2
+  data.tar.gz: ccc9d6a9d68ae52e67679c8d0a23ad2907bb47c4
 SHA512:
-  metadata.gz: e9db61d4d7cf99dfce50fd88edf289e8ce5d617c744099e3ba72c8e91a47b679869726c087205bb695836b1651b6546b2439116df02872224e42160f61b1f5a1
-  data.tar.gz: db5259ef0fedd5d6a1d77fc4d2f35364c210ce398443d441098b54baa14f805bedef1148ded0c94e6ce655ec6b68f2370c65d49b78c97dc46606789ccd428a4b
+  metadata.gz: 22ddeaedff64fd9c1bea85e4f54e2c3ad44f24f1b4d844e9d2413103abb506322420d326b8efb20c260b8935f567d70d5cd53be0796cc75b82ea2c4a8a315317
+  data.tar.gz: 2e7ff811aeb6f0397bcd2d62d8dd373fa034939ee7c8513c2a3e181165cce725fc6a3ab3d98f16727b46022c3ae835717452196b4a7eea68db9b7cef6c6340df

data/fluent-plugin-buffer-event_limited.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-buffer-event_limited"
-  spec.version       = "0.1.3"
+  spec.version       = "0.1.4"
   spec.authors       = ["TAGOMORI Satoshi", 'Gergo Sulymosi']
   spec.email         = ["tagomoris@gmail.com", 'gergo.sulymosi@gmail.com']
   spec.description   = %q{Fluentd memory buffer plugin with many types of chunk limits}

data/lib/fluent/plugin/buf_event_limited.rb

@@ -6,7 +6,7 @@ module Fluent
 
     def initialize(key, path, unique_id, separator, mode = "a+", symlink_path = nil)
       super(key, path, unique_id, mode = "a+", symlink_path = nil)
-      init_counter(path, separator)
+      init_counter(separator)
     end
 
     def <<(data)
@@ -18,18 +18,22 @@ module Fluent
 
     private
 
-    def init_counter(path, separator)
-      @record_counter = \
+    def init_counter(separator)
+      old_pos = @file.pos
+      @file.rewind
+
+      @record_counter = (
         case separator
-        when 'msgpack'
-          MessagePack::Unpacker.new(File.open(path)).each.inject(0) { |c, _| c + 1 }
-        when 'newline'
-          File.foreach(path, $/).inject(0) { |c, _| c + 1 }
-        when 'tab'
-          File.foreach(path, "\t").inject(0) { |c, _| c + 1 }
+        when 'msgpack' then MessagePack::Unpacker.new(@file).each
+        when 'newline' then @file.each($/)
+        when 'tab'     then @file.each("\t")
         else
           raise ArgumentError, "Separator #{separator.inspect} is not supported"
         end
+      ).inject(0) { |c, _| c + 1 }
+
+      @file.pos = old_pos
+      $log.trace("#init_counter(#{[path, separator].join(', ')}) => #{@record_counter}")
     end
   end
 
@@ -39,6 +43,11 @@ module Fluent
     config_param :buffer_chunk_records_limit, :integer, :default => Float::INFINITY
     config_param :buffer_chunk_message_separator, :string, :default => 'msgpack'
 
+    def storable?(chunk, data)
+      (chunk.record_counter < @buffer_chunk_records_limit) &&
+        ((chunk.size + data.bytesize) <= @buffer_chunk_limit)
+    end
+
     def new_chunk(key)
       encoded_key = encode_key(key)
       path, tsuffix = make_path(encoded_key, 'b')
@@ -53,24 +62,25 @@ module Fluent
       maps = []
       queues = []
 
-      Dir.glob("#{@buffer_path_prefix}*#{@buffer_path_suffix}") {|path|
+      Dir.glob("#{@buffer_path_prefix}*#{@buffer_path_suffix}") do |path|
         identifier_part = chunk_identifier_in_path(path)
-        if m = PATH_MATCH.match(identifier_part)
-          key = decode_key(m[1])
-          bq = m[2]
-          tsuffix = m[3]
-          timestamp = m[3].to_i(16)
-          unique_id = tsuffix_to_unique_id(tsuffix)
-
-          if bq == 'b'
-            chunk = EventLimitedBufferChunk.new(key, path, unique_id, @buffer_chunk_message_separator, "a+")
-            maps << [timestamp, chunk]
-          elsif bq == 'q'
-            chunk = EventLimitedBufferChunk.new(key, path, unique_id, @buffer_chunk_message_separator, "r")
-            queues << [timestamp, chunk]
-          end
+        next unless (m = PATH_MATCH.match(identifier_part))
+
+        key = decode_key(m[1])
+        bq = m[2]
+        tsuffix = m[3]
+        timestamp = m[3].to_i(16)
+        unique_id = tsuffix_to_unique_id(tsuffix)
+
+        case bq
+        when 'b'
+          chunk = EventLimitedBufferChunk.new(key, path, unique_id, @buffer_chunk_message_separator, "a+")
+          maps << [timestamp, chunk]
+        when 'q'
+          chunk = EventLimitedBufferChunk.new(key, path, unique_id, @buffer_chunk_message_separator, "r")
+          queues << [timestamp, chunk]
         end
-      }
+      end
 
       map = {}
       maps
@@ -83,10 +93,5 @@ module Fluent
 
       return queue, map
     end
-
-    def storable?(chunk, data)
-      chunk.record_counter < @buffer_chunk_records_limit &&
-        (chunk.size + data.bytesize) <= @buffer_chunk_limit
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-buffer-event_limited
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - TAGOMORI Satoshi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler