Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix to require compat modules missed in previous #1168

Merged
merged 1 commit into from
Aug 22, 2016
Merged

fix to require compat modules missed in previous #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/fluent/compat/handle_tag_and_time_mixin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
# limitations under the License.
#

require 'fluent/time' # TimeFormatter

module Fluent
module Compat
module HandleTagAndTimeMixin
Expand Down
4 changes: 3 additions & 1 deletion lib/fluent/compat/output.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
require 'fluent/plugin/bare_output'
require 'fluent/compat/call_super_mixin'
require 'fluent/compat/formatter_utils'
require 'fluent/compat/handle_tag_and_time_mixin'
require 'fluent/compat/parser_utils'
require 'fluent/compat/propagate_default'
require 'fluent/compat/record_filter_mixin'
require 'fluent/compat/output_chain'
require 'fluent/timezone'
require 'fluent/mixin'
Expand Down Expand Up @@ -265,7 +267,7 @@ 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
@includes_record_filter = self.class.ancestors.include?(Fluent::Compat::RecordFilterMixin)

methods_of_plugin = self.class.instance_methods(false)
@overrides_emit = methods_of_plugin.include?(:emit)
Expand Down
14 changes: 14 additions & 0 deletions test/test_output.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,20 @@ def test_configure
# assert_equal Float, d.instance.retry_wait.class
end

class FormatterInjectTestOutput < Fluent::Output
def initialize
super
@formatter = nil
end
end
def test_start
i = FormatterInjectTestOutput.new
i.configure(config_element('ROOT', '', {}, [config_element('inject', '', {'hostname_key' => "host"})]))
assert_nothing_raised do
i.start
end
end

def create_mock_driver(conf=CONFIG)
Fluent::Test::BufferedOutputTestDriver.new(Fluent::BufferedOutput) do
attr_accessor :submit_flush_threads
Expand Down