fluent-plugin-scribe 0.9.11 → 0.10.0

data/README.rdoc

@@ -47,7 +47,7 @@ The following options are supported.
 
 * 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: thread_pool)
+* server_type: server architecture either in 'simple', 'threaded', 'thread_pool', 'nonblocking' (default: nonblocking)
 * framed: use framed protocol or not (default: true)
 
 == For Developers

data/Rakefile

@@ -9,10 +9,10 @@ begin
     gemspec.summary = "Scribe plugin for Fluent event collector"
     gemspec.author = "Kazuki Ohta"
     #gemspec.email = "kazuki.ohta@gmail.com"
-    #gemspec.homepage = "http://fluent.github.com/"
+    gemspec.homepage = "https://github.com/fluent/fluent-plugin-scribe"
     gemspec.has_rdoc = false
     gemspec.require_paths = ["lib"]
-    gemspec.add_dependency "fluent", "~> 0.9.7"
+    gemspec.add_dependency "fluentd", "~> 0.10.0"
     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.9.11
+0.10.0

data/fluent-plugin-scribe.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fluent-plugin-scribe}
-  s.version = "0.9.11"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kazuki Ohta"]
-  s.date = %q{2011-10-09}
+  s.date = %q{2011-10-16}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     "example.conf",
     "fluent-plugin-scribe.gemspec",
     "lib/fluent/plugin/in_scribe.rb",
+    "lib/fluent/plugin/out_scribe.rb",
     "lib/fluent/plugin/thrift/facebook_service.rb",
     "lib/fluent/plugin/thrift/fb303.thrift",
     "lib/fluent/plugin/thrift/fb303_constants.rb",
@@ -30,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/fluent/plugin/thrift/scribe_constants.rb",
     "lib/fluent/plugin/thrift/scribe_types.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}
@@ -38,14 +40,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fluent>, ["~> 0.9.7"])
+      s.add_runtime_dependency(%q<fluentd>, ["~> 0.10.0"])
       s.add_runtime_dependency(%q<thrift>, ["~> 0.7.0"])
     else
-      s.add_dependency(%q<fluent>, ["~> 0.9.7"])
+      s.add_dependency(%q<fluentd>, ["~> 0.10.0"])
       s.add_dependency(%q<thrift>, ["~> 0.7.0"])
     end
   else
-    s.add_dependency(%q<fluent>, ["~> 0.9.7"])
+    s.add_dependency(%q<fluentd>, ["~> 0.10.0"])
     s.add_dependency(%q<thrift>, ["~> 0.7.0"])
   end
 end

data/lib/fluent/plugin/in_scribe.rb

@@ -106,10 +106,10 @@ class ScribeInput < Input
     def Log(msgs)
       begin
         msgs.each { |msg|
-          event = Event.new(Engine.now, {
+          record = {
             'message' => msg.message
-          })
-          Engine.emit(msg.category, event)
+          }
+          Engine.emit(msg.category, Engine.now, record)
         }
         return ResultCode::OK
       rescue => e

data/lib/fluent/plugin/out_scribe.rb

@@ -0,0 +1,84 @@
+#
+# Fluent
+#
+# Copyright (C) 2011 Kazuki Ohta
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+module Fluent
+
+class ScribeOutput < BufferedOutput
+  Fluent::Plugin.register_output('scribe', self)
+
+  def initialize
+    super
+    require 'thrift'
+    $:.unshift File.join(File.dirname(__FILE__), 'thrift')
+    require 'fb303_types'
+    require 'fb303_constants'
+    require 'facebook_service'
+    require 'scribe_types'
+    require 'scribe_constants'
+    require 'scribe'
+  end
+
+  def configure(conf)
+    super
+
+    @host = 'localhost'
+    @port = 38888
+  end
+
+  def start
+    super
+  end
+
+  def shutdown
+    super
+  end
+
+  def format(tag, event)
+    [tag, event.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
+    }
+
+    socket = Thrift::Socket.new @host, @port.to_i
+    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
+  end
+end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-scribe
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-09 00:00:00.000000000 +09:00
+date: 2011-10-16 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fluent
-  requirement: &2158069900 !ruby/object:Gem::Requirement
+  name: fluentd
+  requirement: &2153379240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158069900
+  version_requirements: *2153379240
 - !ruby/object:Gem::Dependency
   name: thrift
-  requirement: &2158069360 !ruby/object:Gem::Requirement
+  requirement: &2153378640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158069360
+  version_requirements: *2153378640
 description: 
 email: 
 executables: []
@@ -48,6 +48,7 @@ files:
 - example.conf
 - fluent-plugin-scribe.gemspec
 - lib/fluent/plugin/in_scribe.rb
+- lib/fluent/plugin/out_scribe.rb
 - lib/fluent/plugin/thrift/facebook_service.rb
 - lib/fluent/plugin/thrift/fb303.thrift
 - lib/fluent/plugin/thrift/fb303_constants.rb
@@ -58,7 +59,7 @@ files:
 - lib/fluent/plugin/thrift/scribe_types.rb
 - README.rdoc
 has_rdoc: true
-homepage: 
+homepage: https://github.com/fluent/fluent-plugin-scribe
 licenses: []
 post_install_message: 
 rdoc_options: []