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

Jump to bottom

Fix backward compatibility with Fluent::DetachProcess and Fluent::DetachMultiProcess #1522

Merged
merged 2 commits into from
Apr 12, 2017
Merged

Fix backward compatibility with Fluent::DetachProcess and Fluent::DetachMultiProcess #1522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e021a7
Add detach_process and detach_multi_process for backward compatibility
okkez Mar 30, 2017
f3983b3
Remove redundant methods
okkez Mar 30, 2017
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
8 changes: 8 additions & 0 deletions lib/fluent/compat/detach_process_mixin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,17 @@
module Fluent
module Compat
module DetachProcessMixin
def detach_process
log.warn "#{__method__} is not supported in this version. ignored."
yield
end
end

module DetachMultiProcessMixin
def detach_multi_process
log.warn "#{__method__} is not supported in this version. ignored."
yield
end
end
end
end
10 changes: 0 additions & 10 deletions lib/fluent/compat/input.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,6 @@ def before_shutdown
def shutdown
super
end

def detach_process(&block)
log.warn "detach_process is not supported in this version. ignored."
block.call
end

def detach_multi_process(&block)
log.warn "detach_multi_process is not supported in this version. ignored."
block.call
end
end
end
end
10 changes: 0 additions & 10 deletions lib/fluent/compat/output.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,16 +190,6 @@ def start
end
end
end

def detach_process(&block)
log.warn "detach_process is not supported in this version. ignored."
block.call
end

def detach_multi_process(&block)
log.warn "detach_process is not supported in this version. ignored."
block.call
end
end

class MultiOutput < Fluent::Plugin::BareOutput
Expand Down