fluent-plugin-scribe 0.10.4 → 0.10.5

data/ChangeLog

@@ -1,3 +1,12 @@
+Release 0.10.5 - 2011/11/16
+
+* use DetachMultiProcessMixin and ObjectBufferedOutput, introduced from
+  fluentd v0.10.7
+
+
+Release 0.10.4 - 2011/11/14
+
+
 Release 0.10.3 - 2011/11/14
 
 * fixed encoding problem (work-around for thrift-rb)

data/README.rdoc

@@ -43,13 +43,27 @@ Please add the following configurations to fluent.conf.
     port 1463
   </source>
 
+  # Scribe output
+  <match *>
+    type scribe
+    host scribed-host.local
+    port 1463
+  </match>
+
 These options are supported.
 
+* (for input)
 * port: port number (default: 1463)
 * bind: bind address (default: 0.0.0.0)
 * server_type: server architecture either in 'simple', 'threaded', 'thread_pool', 'nonblocking' (default: nonblocking)
 * is_framed: use framed protocol or not (default: true)
 
+* (for output)
+* host: host name or address (default: localhost)
+* port: port number (default: 1463)
+* field_ref: field name which sent as scribe log message (default: message)
+* timeout: thrift protocol timeout (default: 30)
+
 == For Developers
 
 To test this plugin, please execute the following command in your 'fluent' project directory, not scribe input plugin directory.

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gemspec.homepage = "https://github.com/fluent/fluent-plugin-scribe"
     gemspec.has_rdoc = false
     gemspec.require_paths = ["lib"]
-    gemspec.add_dependency "fluentd", "~> 0.10.0"
+    gemspec.add_dependency "fluentd", "~> 0.10.7"
     gemspec.add_dependency "thrift", "~> 0.7.0"
     gemspec.test_files = Dir["test/**/*.rb"]
     gemspec.files = Dir["bin/**/*", "lib/**/*", "test/**/*.rb"] +

data/VERSION

@@ -1 +1 @@
-0.10.4
+0.10.5

data/lib/fluent/plugin/in_scribe.rb

@@ -20,6 +20,8 @@ module Fluent
 class ScribeInput < Input
   Plugin.register_input('scribe', self)
 
+  include DetachMultiProcessMixin
+
   config_param :port,            :integer, :default => 1463
   config_param :bind,            :string,  :default => '0.0.0.0'
   config_param :server_type,     :string,  :default => 'nonblocking'
@@ -80,7 +82,16 @@ class ScribeInput < Input
     else
       raise ConfigError, "in_scribe: unsupported server_type '#{@server_type}'"
     end
-    @thread = Thread.new(&method(:run))
+
+    if @detach_process
+      @transport.listen
+      def @transport.listen
+      end
+    end
+
+    detach_multi_process do
+      @thread = Thread.new(&method(:run))
+    end
   end
 
   def shutdown
@@ -98,11 +109,18 @@ class ScribeInput < Input
   class FluentScribeHandler
     def Log(msgs)
       begin
+        tags = {}
+        now = Engine.now
         msgs.each { |msg|
+          tag = msg.category
           record = {
             'message' => msg.message.force_encoding('UTF-8')
           }
-          Engine.emit(msg.category, Engine.now, record)
+          es = (tags[tag] ||= MultiEventStream.new)
+          es.add(now, record)
+        }
+        tags.each_pair { |tag, es|
+          Engine.emit_stream(tag, es)
         }
         return ResultCode::OK
       rescue => e

data/lib/fluent/plugin/out_scribe.rb

@@ -17,7 +17,7 @@
 #
 module Fluent
 
-class ScribeOutput < BufferedOutput
+class ScribeOutput < ObjectBufferedOutput
   Fluent::Plugin.register_output('scribe', self)
 
   config_param :host,      :string,  :default => 'localhost'
@@ -49,16 +49,7 @@ class ScribeOutput < BufferedOutput
     super
   end
 
-  def format(tag, time, record)
-    [tag, record].to_msgpack
-  end
-
-  def write(chunk)
-    records = []
-    chunk.msgpack_each { |arr|
-      records << arr
-    }
-
+  def write_objects(tag, es)
     socket = Thrift::Socket.new @host, @port, @timeout
     transport = Thrift::FramedTransport.new socket
     protocol = Thrift::BinaryProtocol.new transport, false, false
@@ -67,8 +58,7 @@ class ScribeOutput < BufferedOutput
     transport.open
     begin
       entries = []
-      records.each { |r|
-        tag, record = r
+      es.each { |time,record|
         next unless record.has_key?(@field_ref)
         entry = LogEntry.new
         entry.category = tag

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-scribe
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000 +09:00
-default_executable: fluent-scribe-remote
+date: 2011-11-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &2156952900 !ruby/object:Gem::Requirement
+  requirement: &15568620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.7
   type: :runtime
   prerelease: false
-  version_requirements: *2156952900
+  version_requirements: *15568620
 - !ruby/object:Gem::Dependency
   name: thrift
-  requirement: &2156952380 !ruby/object:Gem::Requirement
+  requirement: &15567980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +32,7 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156952380
+  version_requirements: *15567980
 description: 
 email: kazuki.ohta@gmail.com
 executables:
@@ -62,7 +61,6 @@ files:
 - test/plugin/in_scribe.rb
 - ChangeLog
 - README.rdoc
-has_rdoc: true
 homepage: https://github.com/fluent/fluent-plugin-scribe
 licenses: []
 post_install_message: 
@@ -83,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Scribe Input/Output plugin for Fluent event collector