fluent-plugin-scribe 0.10.13 → 0.10.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e82d716df29ee314a3d51ee911e32f9b0de07a0f
-  data.tar.gz: 35be26bb3acbe72db1b38bad94b2801875d90e22
+  metadata.gz: fed484e3b03389ad95949efadb75469f0db8fb26
+  data.tar.gz: 8c7b0a17acf583b92e5aa9ec80b5316a8c5b7685
 SHA512:
-  metadata.gz: f98b739988b9bdb0e69d34c56c9139e80cf7c9c1834c3d59f6ee22a449552230e471ee711fa3284487f6fb2735d296c6d42b182168653595526dc5a34fce1031
-  data.tar.gz: 9dc6b1104e4b3aace045c925961b3224e4cc215de001303191f3cd560a94828b7f6929bccc66a1168de4958383b99d140c6ec923c30c861280af3adae46bdedd
+  metadata.gz: aa5bfa8ea262f65bf992283afccfc9708efb866ec3762f2b7250b77b17fff2c4a27b95a3aee4b31a46d89a30c6225fc42ff530772c9d4dd76a4ad35ba2e67ad3
+  data.tar.gz: 667cebaad66f654b2999dfd6866eab4598c9eb80f224f6b001b1622251e92a94aa0a84343142a2268a4a777ad2e58e3b989d723c89ac969e052d633c7d425aa9

data/ChangeLog

@@ -1,9 +1,13 @@
-Release 0.10.13 - 2013/10/29
+Release 0.10.14 - 2014/12/19
+* add ignore_invalid_record to out_scribe
+* improve input performance by reducing the times of emit
+
+Release 0.10.13 - 2014/10/29
 * add validation for msg_format
 * use Yajl instead of JSON for parsing record
 * add ignore_invalid_record option to ignore invalid record and return OK to scribed
 
-Release 0.10.12 - 2013/09/04
+Release 0.10.12 - 2014/09/04
 * support 'log_level' option
 * fix to do shutdown plugin instance not to duplicate listen
 

data/fluent-plugin-scribe.gemspec

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

data/lib/fluent/plugin/in_scribe.rb

@@ -127,30 +127,38 @@ module Fluent
       attr_accessor :logger # Use logger instead of log to avoid confusion with Log method
 
       def Log(msgs)
+        bucket = {} # tag -> events(array of [time,record])
+        time_now = Engine.now
         begin
-          msgs.each { |msg|
+          msgs.each do |msg|
             begin
               record = create_record(msg)
             rescue => e
               if @ignore_invalid_record
                 # This warning can be disabled by 'log_level error'
-                logger.warn "got invalid record: #{msg}"
+                logger.warn "got invalid record", message: msg, error_class: e.class, error: e
                 next
-              else
-                # Keep existence behaviour
-                raise e
               end
-            end
 
-            if @add_prefix
-              Engine.emit(@add_prefix + '.' + msg.category, Engine.now, record)
-            else
-              Engine.emit(msg.category, Engine.now, record)
+              raise
             end
-          }
+            tag = @add_prefix ? @add_prefix + '.' + msg.category : msg.category
+            bucket[tag] ||= []
+            bucket[tag].push([time_now,record])
+          end
+        rescue => e
+          logger.error "unexpected error", error_class: e.class, error: e
+          logger.error_backtrace
+          return ResultCode::TRY_LATER
+        end
+
+        begin
+          bucket.each do |tag,events|
+            Engine.emit_array(tag, events)
+          end
           return ResultCode::OK
         rescue => e
-          logger.error "unexpected error", :error => e.inspect
+          logger.error "unexpected error", error_class: e.class, error: e
           logger.error_backtrace
           return ResultCode::TRY_LATER
         end

data/lib/fluent/plugin/out_scribe.rb

@@ -26,6 +26,7 @@ module Fluent
 
     config_param :remove_prefix,    :string,  :default => nil
     config_param :add_newline,      :bool,    :default => false
+    config_param :ignore_invalid_record, :bool, :default => false
     config_param :default_category, :string,  :default => 'unknown'
     config_param :format_to_json,   :bool,    :default => false
 
@@ -92,7 +93,18 @@ module Fluent
           message = @format_to_json ? record : record[@field_ref]
 
           if message.kind_of?(Array) or message.kind_of?(Hash)
-            message = message.to_json
+            begin
+              message = message.to_json
+            rescue => e
+              if @ignore_invalid_record
+                # This warning can be disabled by 'log_level error'
+                log.warn "got invalid message", message: message, error: e, error_class: e.class
+                next
+              else
+                # Keep existence behaviour
+                raise
+              end
+            end
           end
 
           if @add_newline

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-scribe
 version: !ruby/object:Gem::Version
-  version: 0.10.13
+  version: 0.10.14
 platform: ruby
 authors:
 - Kazuki Ohta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake