fluent-plugin-scribe 0.10.6 → 0.10.7

data/ChangeLog

@@ -1,3 +1,8 @@
+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

data/VERSION

@@ -1 +1 @@
-0.10.6
+0.10.7

data/fluent-plugin-scribe.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fluent-plugin-scribe}
-  s.version = "0.10.6"
+  s.version = "0.10.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kazuki Ohta}]
-  s.date = %q{2012-01-23}
+  s.date = %q{2012-02-04}
   s.email = %q{kazuki.ohta@gmail.com}
   s.executables = [%q{fluent-scribe-remote}]
   s.extra_rdoc_files = [

data/lib/fluent/plugin/out_scribe.rb

@@ -26,6 +26,7 @@ class ScribeOutput < BufferedOutput
   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'
 
   def initialize
@@ -81,14 +82,25 @@ class ScribeOutput < BufferedOutput
     transport.open
     begin
       entries = []
-      records.each { |r|
-        tag, record = r
-        next unless record.has_key?(@field_ref)
-        entry = LogEntry.new
-        entry.category = tag
-        entry.message = record[@field_ref].force_encoding('ASCII-8BIT')
-        entries << entry
-      }
+      if @add_newline
+        records.each { |r|
+          tag, record = r
+          next unless record.has_key?(@field_ref)
+          entry = LogEntry.new
+          entry.category = tag
+          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
+          entry.message = record[@field_ref].force_encoding('ASCII-8BIT')
+          entries << entry
+        }
+      end
       client.Log(entries)
     ensure
       transport.close

data/test/plugin/out_scribe.rb

@@ -69,6 +69,19 @@ remove_prefix test
     d.emit({"message" => "xxx testing first", "message2" => "xxx testing first another data"}, time)
     d.expect_format ['unknown', {"message" => "xxx testing first", "message2" => "xxx testing first another data"}].to_msgpack
     d.run
+
+    d = create_driver(CONFIG + %[
+field_ref message2
+remove_prefix test
+add_newline true
+    ], 'test.scribeplugin')
+    assert_equal 'test.scribeplugin', d.tag
+
+    d.emit({"message" => "xxx testing first", "message2" => "xxx testing first another data"}, time)
+    d.emit({"message" => "xxx testing second", "message2" => "xxx testing second another data"}, time)
+    d.expect_format ['scribeplugin', {"message" => "xxx testing first", "message2" => "xxx testing first another data"}].to_msgpack
+    d.expect_format ['scribeplugin', {"message" => "xxx testing second", "message2" => "xxx testing second another data"}].to_msgpack
+    d.run
   end
 
   def test_write
@@ -95,6 +108,18 @@ remove_prefix test
 
     d = create_driver(CONFIG + %[
 field_ref message2
+remove_prefix test
+add_newline true
+    ], 'test.scribeplugin')
+    assert_equal 'test.scribeplugin', d.tag
+    d.emit({"message" => "xxx testing first", "message2" => "xxx testing first another data"}, time)
+    d.emit({"message" => "xxx testing second", "message2" => "xxx testing second another data"}, time)
+    result = d.run
+    assert_equal ResultCode::OK, result
+    assert_equal [['scribeplugin', "xxx testing first another data\n"], ['scribeplugin', "xxx testing second another data\n"]], $handler.last
+
+    d = create_driver(CONFIG + %[
+field_ref message2
 remove_prefix test
     ], 'xxx.test.scribeplugin')
     assert_equal 'xxx.test.scribeplugin', d.tag

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-scribe
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2012-02-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &2160486020 !ruby/object:Gem::Requirement
+  requirement: &2156552400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160486020
+  version_requirements: *2156552400
 - !ruby/object:Gem::Dependency
   name: thrift
-  requirement: &2160485540 !ruby/object:Gem::Requirement
+  requirement: &2156551600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160485540
+  version_requirements: *2156551600
 description: 
 email: kazuki.ohta@gmail.com
 executables: