out_string_scrub.rb in fluent-plugin-string-scrub-1.0.0

- old
+ new

@@ -1,21 +1,19 @@
-class Fluent::StringScrubOutput < Fluent::Output
+require 'fluent/plugin/output'
+
+class Fluent::Plugin::StringScrubOutput < Fluent::Plugin::Output
   Fluent::Plugin.register_output('string_scrub', self)
 
+  helpers :event_emitter
+
   config_param :tag, :string, :default => nil
   config_param :remove_prefix, :string, :default => nil
   config_param :add_prefix, :string, :default => nil
   config_param :replace_char, :string, :default => ''
 
-  # Define `router` method of v0.12 to support v0.10 or earlier
-  unless method_defined?(:router)
-    define_method("router") { Fluent::Engine }
-  end
-
   def initialize
     super
-    require 'string/scrub' if RUBY_VERSION.to_f < 2.1
   end
 
   def configure(conf)
     super
 
@@ -38,11 +36,11 @@
     if @replace_char =~ /\\u\{*[A-F0-9]{4}\}*/
       @replace_char = eval("\"#{@replace_char}\"")
     end
   end
 
-  def emit(tag, es, chain)
+  def process(tag, es)
     tag = if @tag
             @tag
           else
             if @remove_prefix and
                 ( (tag.start_with?(@removed_prefix_string) and tag.length > @removed_length) or tag == @remove_prefix)
@@ -61,11 +59,9 @@
     es.each do |time,record|
       scrubbed = recv_record(record)
       next if scrubbed.nil?
       router.emit(tag, time, scrubbed)
     end
-
-    chain.next
   end
 
   def recv_record(record)
     scrubbed = {}
     record.each do |k,v|