fluent-plugin-scribe 0.9.9 → 0.9.10

data/README.rdoc

@@ -44,6 +44,17 @@ Install this plugin with fluent, and add the following configuration to fluent.c
 
 You can modify port, and the corresponding tag.
 
+== For Developers
+
+To test this plugin, please execute the following command in your 'fluent' project directory, not scribe input plugin directory.
+
+  $ export SCRIBE_PLUGIN_DIR=../fluent-plugin-scribe                                                                   
+  $ FLUENT_PLUGIN=$SCRIBE_PLUGIN_DIR/lib/fluent/plugin/ ./bin/fluentd --config $SCRIBE_PLUGIN_DIR/example.conf -v -v -v
+
+Then please execute the sample client.
+
+  $ ./bin/fluent-scribe-remote
+
 == Contributors
 
 * {Satoshi Tagomori}[https://github.com/tagomoris]

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.10

data/bin/fluent-scribe-remote

@@ -23,7 +23,7 @@ raw_sock = socket.to_io
 raw_sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
 
 entry = LogEntry.new
-entry.category = 'hoge'
+entry.category = 'debug.hoge'
 entry.message = 'fuga'
 p client.Log([entry])
 

data/example.conf

@@ -2,7 +2,6 @@
 <source>
   type scribe
   port 1463
-  tag debug.aiueo
 </source>
 
 # match tag=debug.** and dump to console

data/fluent-plugin-scribe.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{fluent-plugin-scribe}
-  s.version = "0.9.7"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kazuki Ohta"]
-  s.date = %q{2011-08-06}
+  s.date = %q{2011-09-29}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -17,29 +17,36 @@ Gem::Specification.new do |s|
     "AUTHORS",
     "Rakefile",
     "VERSION",
+    "bin/fluent-scribe-remote",
     "example.conf",
     "fluent-plugin-scribe.gemspec",
-    "lib/fluent/plugin/out_tdlog.rb"
+    "lib/fluent/plugin/in_scribe.rb",
+    "lib/fluent/plugin/thrift/facebook_service.rb",
+    "lib/fluent/plugin/thrift/fb303.thrift",
+    "lib/fluent/plugin/thrift/fb303_constants.rb",
+    "lib/fluent/plugin/thrift/fb303_types.rb",
+    "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"
   ]
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Scribe plugin for Fluent event collector}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thrift>, [">= 0.7.0"])
       s.add_runtime_dependency(%q<fluent>, ["~> 0.9.7"])
+      s.add_runtime_dependency(%q<thrift>, ["~> 0.7.0"])
     else
-      s.add_dependency(%q<thrift>, [">= 0.7.0"])
       s.add_dependency(%q<fluent>, ["~> 0.9.7"])
+      s.add_dependency(%q<thrift>, ["~> 0.7.0"])
     end
   else
-    s.add_dependency(%q<thrift>, [">= 0.7.0"])
     s.add_dependency(%q<fluent>, ["~> 0.9.7"])
+    s.add_dependency(%q<thrift>, ["~> 0.7.0"])
   end
 end
 

data/lib/fluent/plugin/in_scribe.rb

@@ -40,11 +40,6 @@ class ScribeInput < Input
     @port = conf['port'] || @port
     @port = @port.to_i
     @bind = conf['bind'] || @bind
-    if tag = conf['tag']
-      @tag = tag
-    else
-      raise ConfigError, "in_scribe: 'tag' parameter is required on scribe input"
-    end
 
     @server_type = conf['server_type'] || 'thread_pool'
     @is_framed = conf['framed'].to_s != "false"
@@ -57,7 +52,7 @@ class ScribeInput < Input
   def start
     $log.debug "listening scribe on #{@bind}:#{@port}"
 
-    handler = FluentScribeHandler.new @tag
+    handler = FluentScribeHandler.new
     processor = Scribe::Processor.new handler
 
     @transport = Thrift::ServerSocket.new @host, @port
@@ -108,18 +103,13 @@ class ScribeInput < Input
   end
 
   class FluentScribeHandler
-    def initialize(tag)
-      @tag = tag
-    end
-
     def Log(msgs)
       begin
         msgs.each { |msg|
           event = Event.new(Engine.now, {
-            'category' => msg.category,
             'message' => msg.message
           })
-          Engine.emit(@tag, event)
+          Engine.emit(msg.category, event)
         }
         return ResultCode::OK
       rescue => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-scribe
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluent
-  requirement: &2153978940 !ruby/object:Gem::Requirement
+  requirement: &2153972480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *2153978940
+  version_requirements: *2153972480
 - !ruby/object:Gem::Dependency
   name: thrift
-  requirement: &2153978340 !ruby/object:Gem::Requirement
+  requirement: &2153971820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153978340
+  version_requirements: *2153971820
 description: 
 email: 
 executables: []