Merge pull request #1005 from fluent/fix-call-filter_record-from-comp…

…at-v14 Fix to call #format_stream of plugin themselves when RecordFilter mixin included
fluent · May 30, 2016 · 9cd3e1c · 9cd3e1c
2 parents fa3bc38 + 0319614
commit 9cd3e1c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/fluent/compat/output.rb b/lib/fluent/compat/output.rb
@@ -240,9 +240,12 @@ def configure(conf)
           conf.elements << Fluent::Config::Element.new('buffer', '', buf_params, [])
         end
 
+        @includes_record_filter = self.class.ancestors.include?(Fluent::RecordFilterMixin) # TODO rename Compat::RecordFilterMixin
+
         methods_of_plugin = self.class.instance_methods(false)
         @overrides_emit = methods_of_plugin.include?(:emit)
-        @overrides_format_stream = methods_of_plugin.include?(:format_stream)
+        # RecordFilter mixin uses its own #format_stream method implementation
+        @overrides_format_stream = methods_of_plugin.include?(:format_stream) || @includes_record_filter
 
         super