fluent-plugin-scribe 0.10.11 → 0.10.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1fa97e1091c9a7b3864e658377226530c5796b8
-  data.tar.gz: 53a1f639942eaab9d0ec71c663b6947bce5eea95
+  metadata.gz: 4742edb4137955d08718e1cc275f2b163a0f7d98
+  data.tar.gz: 454ccd6f4ebb77898c159c25bb17e17c0f94526c
 SHA512:
-  metadata.gz: 5724cce9d7574385413afd56a28e078748a8936557a0aefa5f162aeb64058b17d6d5ae299a57ffa02149943ccb4c8fc9ac2e929cf8ef771e4a78e09ffbc39763
-  data.tar.gz: d32cf42a08d55bcb0678b85144b54f2411d5301c7ef273ac25eab37cb0a97f363b5f583e854dcf501ea0ddff32dc80f71b813967091d1ebab35e7a6aa9a8de3a
+  metadata.gz: 5d607d8c5e8f579efe419e4575340caa1fca4b3103c48895e1208394eae5a30c609fe136875f8ad768b79484add797d12493e071747c6eb9e0d35f86598ac215
+  data.tar.gz: 5419ee2a3a620720172a909baa0087cf8e15da93ffd8a253a1aee2f891b0d40405272ec6e8e6600391877ac46eb7ca366fc3d670500eabf800b2bf13029f07ee

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+
+branches:
+  only:
+    - master
+
+script: bundle exec rake test

data/README.rdoc

@@ -74,19 +74,19 @@ These options are supported.
 * port: port number (default: 1463)
 * field_ref: field name which sent as scribe log message (default: message)
 * timeout: thrift protocol timeout (default: 30)
-* body_format: parse a body message as a specified format (default: 'text', option: 'json')
+* format_to_json: if true/yes, format entire record as json, and send as message (default: false)
 * remove_prefix: prefix string, removed from the tag (default: nil)
 
 == For Developers
 
-To test this plugin, please execute the following command in your 'fluent' project directory, not scribe input plugin directory.
+To run fluentd with this plugin on chaging,
 
-  $ 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
+  $ bundle # (or 'bundle update')
+  $ bundle exec fluentd -v -v -v -c example.conf
 
 Then please execute the sample client.
 
-  $ ./bin/fluent-scribe-remote
+  $ bundle exec bin/fluent-scribe-remote
 
 == Contributors
 

data/fluent-plugin-scribe.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-scribe"
-  gem.version       = "0.10.11"
+  gem.version       = "0.10.12"
 
   gem.authors       = ["Kazuki Ohta", "TAGOMORI Satoshi"]
   gem.email         = ["kazuki.ohta@gmail.com", "tagomoris@gmail.com"]

data/lib/fluent/plugin/in_scribe.rb

@@ -28,6 +28,10 @@ module Fluent
     config_param :remove_newline,  :bool,    :default => false
     config_param :msg_format,      :string,  :default => 'text'
 
+    unless method_defined?(:log)
+      define_method(:log) { $log }
+    end
+
     def initialize
       require 'cgi'
       require 'thrift'
@@ -46,12 +50,13 @@ module Fluent
     end
 
     def start
-      $log.debug "listening scribe on #{@bind}:#{@port}"
+      log.debug "listening scribe on #{@bind}:#{@port}"
 
       handler = FluentScribeHandler.new
       handler.add_prefix = @add_prefix
       handler.remove_newline = @remove_newline
       handler.msg_format = @msg_format
+      handler.logger = log
       processor = Scribe::Processor.new handler
 
       @transport = Thrift::ServerSocket.new @bind, @port
@@ -101,14 +106,15 @@ module Fluent
     def run
       @server.serve
     rescue
-      $log.error "unexpected error", :error=>$!.to_s
-      $log.error_backtrace
+      log.error "unexpected error", :error=>$!.to_s
+      log.error_backtrace
     end
 
     class FluentScribeHandler
       attr_accessor :add_prefix
       attr_accessor :remove_newline
       attr_accessor :msg_format
+      attr_accessor :logger # Use logger instead of log to avoid confusion with Log method
 
       def Log(msgs)
         begin
@@ -122,8 +128,8 @@ module Fluent
           }
           return ResultCode::OK
         rescue => e
-          $log.error "unexpected error", :error=>$!.to_s
-          $log.error_backtrace
+          logger.error "unexpected error", :error=>$!.to_s
+          logger.error_backtrace
           return ResultCode::TRY_LATER
         end
       end

data/lib/fluent/plugin/out_scribe.rb

@@ -29,6 +29,10 @@ module Fluent
     config_param :default_category, :string,  :default => 'unknown'
     config_param :format_to_json,   :bool,    :default => false
 
+    unless method_defined?(:log)
+      define_method(:log) { $log }
+    end
+
     def initialize
       require 'thrift'
       $:.unshift File.join(File.dirname(__FILE__), 'thrift')
@@ -102,7 +106,7 @@ module Fluent
           entries << entry
         end
 
-        $log.debug "Writing #{entries.count} entries to scribe"
+        log.debug "Writing #{entries.count} entries to scribe"
         client.Log(entries)
       ensure
         transport.close

data/test/plugin/test_in_scribe.rb

@@ -18,6 +18,12 @@ class ScribeInputTest < Test::Unit::TestCase
     Fluent::Test::InputTestDriver.new(Fluent::ScribeInput).configure(conf)
   end
 
+  def shutdown_driver(driver)
+    return unless driver.instance.instance_eval{ @thread }
+    driver.instance.shutdown
+    driver.instance.instance_eval{ @thread && @thread.join }
+  end
+
   def test_configure
     d = create_driver
     assert_equal 14630, d.instance.port
@@ -44,6 +50,8 @@ class ScribeInputTest < Test::Unit::TestCase
         assert_equal ResultCode::OK, res
       }
     end
+
+    shutdown_driver(d)
   end
 
   def test_add_prefix
@@ -68,6 +76,8 @@ class ScribeInputTest < Test::Unit::TestCase
       }
     end
 
+    shutdown_driver(d)
+
     d2 = create_driver(CONFIG + %[
       add_prefix scribe.input
     ])
@@ -88,6 +98,8 @@ class ScribeInputTest < Test::Unit::TestCase
         assert_equal ResultCode::OK, res
       }
     end
+
+    shutdown_driver(d2)
   end
 
   def test_remove_newline
@@ -114,6 +126,8 @@ class ScribeInputTest < Test::Unit::TestCase
         assert_equal ResultCode::OK, res
       }
     end
+
+    shutdown_driver(d)
   end
 
   def test_msg_format_json
@@ -140,6 +154,8 @@ class ScribeInputTest < Test::Unit::TestCase
         assert_equal ResultCode::OK, res
       }
     end
+
+    shutdown_driver(d)
   end
 
   def test_msg_format_url_param
@@ -170,6 +186,8 @@ class ScribeInputTest < Test::Unit::TestCase
         assert_equal ResultCode::OK, res
       }
     end
+
+    shutdown_driver(d)
   end
 
   def message_send(tag, msg)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-scribe
 version: !ruby/object:Gem::Version
-  version: 0.10.11
+  version: 0.10.12
 platform: ruby
 authors:
 - Kazuki Ohta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -63,6 +63,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - AUTHORS
 - ChangeLog
 - Gemfile