Merge pull request #1443 from fluent/fix-regression-of-require-process

Fix regression of require process

lib/fluent/compat/detach_process_mixin.rb

@@ -0,0 +1,25 @@
+#
+# 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 DetachProcessMixin
+    end
+
+    module DetachMultiProcessMixin
+    end
+  end
+end

lib/fluent/compat/input.rb

@@ -16,6 +16,7 @@
 
 require 'fluent/plugin'
 require 'fluent/plugin/input'
+require 'fluent/process'
 require 'fluent/compat/call_super_mixin'
 
 module Fluent

lib/fluent/compat/output.rb

@@ -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'

lib/fluent/process.rb

@@ -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.
+#
+
+require 'fluent/compat/detach_process_mixin'
+
+module Fluent
+  DetachProcessMixin = Fluent::Compat::DetachProcessMixin
+  DetachMultiProcessMixin = Fluent::Compat::DetachMultiProcessMixin
+end

test/test_process.rb

@@ -0,0 +1,14 @@
+require_relative 'helper'
+require 'fluent/process'
+
+class ProcessCompatibilityTest < ::Test::Unit::TestCase
+  test 'DetachProcessMixin is defined' do
+    assert defined?(::Fluent::DetachProcessMixin)
+    assert_equal ::Fluent::DetachProcessMixin, ::Fluent::Compat::DetachProcessMixin
+  end
+
+  test 'DetachMultiProcessMixin is defined' do
+    assert defined?(::Fluent::DetachMultiProcessMixin)
+    assert_equal ::Fluent::DetachMultiProcessMixin, ::Fluent::Compat::DetachMultiProcessMixin
+  end
+end