fluent-plugin-scribe 0.10.8 → 0.10.9

data/ChangeLog

@@ -1,47 +1,34 @@
-Release 0.10.8 - 2011/04/27
+Release 0.10.9 - 2011/05/30
+* overwrite default value of buffer_chunk_limit to 1MB
+* improve memory usage efficiency
 
+Release 0.10.8 - 2011/04/27
 * support msg_format option at in_scribe
 
-
 Release 0.10.7 - 2011/02/04
-
 * support add_newline option at out_scribe
 
-
 Release 0.10.6 - 2011/01/23
-
 * support add_prefix / remove_prefix option
 * update thrift to 0.8.0
 * support remove_newline option
 
-
 Release 0.10.5 - 2011/11/16
-
 * fixed broken gemspec
 
-
 Release 0.10.4 - 2011/11/14
-
 * fixed encoding problem (work-around for thrift-rb)
   - contributed by @tagomoris and @frsyuki
 
-
 Release 0.10.3 - 2011/10/16
-
 * modify summary of gemspec
 
-
 Release 0.10.2 - 2011/10/16
-
 * implement out_scribe plugin
 
-
 Release 0.10.1 - 2011/10/16
-
 * added tests for in_scribe
 * use Configurable, introduced from fluentd v0.10
 
-
 Release 0.10.0 - 2011/10/16
-
 * compatibility changes for fluentd v0.10

data/VERSION

@@ -1 +1 @@
-0.10.8
+0.10.9

data/fluent-plugin-scribe.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-scribe"
-  s.version = "0.10.8"
+  s.version = "0.10.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kazuki Ohta"]
-  s.date = "2012-04-27"
+  s.date = "2012-05-30"
   s.email = "kazuki.ohta@gmail.com"
   s.executables = ["fluent-scribe-remote"]
   s.extra_rdoc_files = [

data/lib/fluent/plugin/out_scribe.rb

@@ -25,9 +25,9 @@ class ScribeOutput < BufferedOutput
   config_param :field_ref, :string,  :default => 'message'
   config_param :timeout,   :integer, :default => 30
 
-  config_param :remove_prefix,    :string, :default => nil
-  config_param :add_newline,      :bool,   :default => false
-  config_param :default_category, :string, :default => 'unknown'
+  config_param :remove_prefix,    :string,  :default => nil
+  config_param :add_newline,      :bool,    :default => false
+  config_param :default_category, :string,  :default => 'unknown'
 
   def initialize
     require 'thrift'
@@ -42,6 +42,9 @@ class ScribeOutput < BufferedOutput
   end
 
   def configure(conf)
+    # override default buffer_chunk_limit
+    conf['buffer_chunk_limit'] ||= '1m'
+
     super
   end
 
@@ -69,11 +72,6 @@ class ScribeOutput < BufferedOutput
   end
 
   def write(chunk)
-    records = []
-    chunk.msgpack_each { |arr|
-      records << arr
-    }
-
     socket = Thrift::Socket.new @host, @port, @timeout
     transport = Thrift::FramedTransport.new socket
     protocol = Thrift::BinaryProtocol.new transport, false, false
@@ -82,25 +80,24 @@ class ScribeOutput < BufferedOutput
     transport.open
     begin
       entries = []
-      if @add_newline
-        records.each { |r|
-          tag, record = r
-          next unless record.has_key?(@field_ref)
-          entry = LogEntry.new
-          entry.category = tag
+
+      chunk.msgpack_each do |arr|
+        tag, record = arr
+        next unless record.has_key?(@field_ref)
+
+        entry = LogEntry.new
+        entry.category = tag
+
+        if @add_newline
           entry.message = (record[@field_ref] + "\n").force_encoding('ASCII-8BIT')
-          entries << entry
-        }
-      else
-        records.each { |r|
-          tag, record = r
-          next unless record.has_key?(@field_ref)
-          entry = LogEntry.new
-          entry.category = tag
+        else
           entry.message = record[@field_ref].force_encoding('ASCII-8BIT')
-          entries << entry
-        }
+        end
+
+        entries << entry
       end
+
+      $log.info "Writing #{entries.count} entries to scribe"
       client.Log(entries)
     ensure
       transport.close

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-scribe
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 0.10.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd