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.

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 regression of require process #1443

Merged
merged 3 commits into from
Feb 1, 2017
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
22 changes: 22 additions & 0 deletions lib/fluent/compat/detach_multi_process_mixin.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# Fluentd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

module Fluent
module Compat
module DetachMultiProcessMixin
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were DetachProcessMixin too. So it's also needed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. I forgot to add it.

end
end
end
1 change: 1 addition & 0 deletions lib/fluent/compat/input.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

require 'fluent/plugin'
require 'fluent/plugin/input'
require 'fluent/process'
require 'fluent/compat/call_super_mixin'

module Fluent
Expand Down
1 change: 1 addition & 0 deletions lib/fluent/compat/output.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
require 'fluent/compat/output_chain'
require 'fluent/timezone'
require 'fluent/mixin'
require 'fluent/process'
require 'fluent/event'

require 'fluent/plugin_helper/compat_parameters'
Expand Down
21 changes: 21 additions & 0 deletions lib/fluent/process.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# Fluentd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

require 'fluent/compat/detach_multi_process_mixin'

module Fluent
DetachMultiProcessMixin = Fluent::Compat::DetachMultiProcessMixin
end
9 changes: 9 additions & 0 deletions test/test_process.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
require_relative 'helper'
require 'fluent/process'

class ProcessCompatibilityTest < ::Test::Unit::TestCase
test 'DetachMultiProcessMixin is defined' do
assert defined?(::Fluent::DetachMultiProcessMixin)
assert_equal ::Fluent::DetachMultiProcessMixin, ::Fluent::Compat::DetachMultiProcessMixin
end
end