fluent-plugin-scribe 0.10.1 → 0.10.2

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gemspec.name = "fluent-plugin-scribe"
     gemspec.summary = "Scribe plugin for Fluent event collector"
     gemspec.author = "Kazuki Ohta"
-    #gemspec.email = "kazuki.ohta@gmail.com"
+    gemspec.email = "kazuki.ohta@gmail.com"
     gemspec.homepage = "https://github.com/fluent/fluent-plugin-scribe"
     gemspec.has_rdoc = false
     gemspec.require_paths = ["lib"]
@@ -17,8 +17,7 @@ begin
     gemspec.test_files = Dir["test/**/*.rb"]
     gemspec.files = Dir["bin/**/*", "lib/**/*", "test/**/*.rb"] +
       %w[example.conf VERSION AUTHORS Rakefile fluent-plugin-scribe.gemspec]
-
-    gemspec.executables = []
+    gemspec.executables = ['fluent-scribe-remote']
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.10.2

data/fluent-plugin-scribe.gemspec

@@ -5,11 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fluent-plugin-scribe}
-  s.version = "0.10.0"
+  s.version = "0.10.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kazuki Ohta"]
   s.date = %q{2011-10-16}
+  s.default_executable = %q{fluent-scribe-remote}
+  s.email = %q{kazuki.ohta@gmail.com}
+  s.executables = ["fluent-scribe-remote"]
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -29,12 +32,14 @@ Gem::Specification.new do |s|
     "lib/fluent/plugin/thrift/scribe.rb",
     "lib/fluent/plugin/thrift/scribe.thrift",
     "lib/fluent/plugin/thrift/scribe_constants.rb",
-    "lib/fluent/plugin/thrift/scribe_types.rb"
+    "lib/fluent/plugin/thrift/scribe_types.rb",
+    "test/plugin/in_scribe.rb"
   ]
   s.homepage = %q{https://github.com/fluent/fluent-plugin-scribe}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Scribe plugin for Fluent event collector}
+  s.test_files = ["test/plugin/in_scribe.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/fluent/plugin/in_scribe.rb

@@ -17,7 +17,6 @@
 #
 module Fluent
 
-
 class ScribeInput < Input
   Plugin.register_input('scribe', self)
 
@@ -49,7 +48,7 @@ class ScribeInput < Input
     handler = FluentScribeHandler.new
     processor = Scribe::Processor.new handler
 
-    @transport = Thrift::ServerSocket.new @host, @port
+    @transport = Thrift::ServerSocket.new @bind, @port
     if @is_framed
       transport_factory = Thrift::FramedTransportFactory.new
     else
@@ -115,6 +114,4 @@ class ScribeInput < Input
   end
 end
 
-
 end
-

data/lib/fluent/plugin/out_scribe.rb

@@ -20,8 +20,12 @@ module Fluent
 class ScribeOutput < BufferedOutput
   Fluent::Plugin.register_output('scribe', self)
 
+  config_param :host,      :string,  :default => 'localhost'
+  config_param :port,      :integer, :default => 1463
+  config_param :field_ref, :string,  :default => 'message'
+  config_param :timeout,   :integer, :default => 30
+
   def initialize
-    super
     require 'thrift'
     $:.unshift File.join(File.dirname(__FILE__), 'thrift')
     require 'fb303_types'
@@ -30,13 +34,11 @@ class ScribeOutput < BufferedOutput
     require 'scribe_types'
     require 'scribe_constants'
     require 'scribe'
+    super
   end
 
   def configure(conf)
     super
-
-    @host = 'localhost'
-    @port = 38888
   end
 
   def start
@@ -47,38 +49,37 @@ class ScribeOutput < BufferedOutput
     super
   end
 
-  def format(tag, event)
-    [tag, event.record].to_msgpack
+  def format(tag, time, record)
+    [tag, record].to_msgpack
   end
 
   def write(chunk)
     records = []
-    chunk.open { |io|
-      begin
-        MessagePack::Unpacker.new(io).each { |record| records << record }
-      rescue EOFError
-        # EOFError always occured when reached end of chunk.
-      end
+    chunk.msgpack_each { |arr|
+      records << arr
     }
 
-    socket = Thrift::Socket.new @host, @port.to_i
+    socket = Thrift::Socket.new @host, @port, @timeout
     transport = Thrift::FramedTransport.new socket
     protocol = Thrift::BinaryProtocol.new transport, false, false
     client = Scribe::Client.new protocol
-    transport.open
 
-    entries = []
-    records.each { |r|
-      entry = LogEntry.new
-      entry.category = r[0]
-      entry.message = r[1].to_json
-      entries << entry
-    }
-    
-    client.Log(entries)
-    transport.close
+    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]
+        entries << entry
+      }
+      client.Log(entries)
+    ensure
+      transport.close
+    end
   end
 end
 
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-scribe
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2011-10-16 00:00:00.000000000 -07:00
-default_executable: 
+default_executable: fluent-scribe-remote
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &2156672800 !ruby/object:Gem::Requirement
+  requirement: &2157073220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156672800
+  version_requirements: *2157073220
 - !ruby/object:Gem::Dependency
   name: thrift
-  requirement: &2156671600 !ruby/object:Gem::Requirement
+  requirement: &2157072380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,11 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156671600
+  version_requirements: *2157072380
 description: 
-email: 
-executables: []
+email: kazuki.ohta@gmail.com
+executables:
+- fluent-scribe-remote
 extensions: []
 extra_rdoc_files:
 - README.rdoc