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

Extract RecordFilter Mixin into compat #1044

Merged
merged 1 commit into from
Jun 14, 2016
Merged
Show file tree
Hide file tree
Changes from all 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
34 changes: 34 additions & 0 deletions lib/fluent/compat/record_filter_mixin.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#
# 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 RecordFilterMixin
def filter_record(tag, time, record)
end

def format_stream(tag, es)
out = ''
es.each {|time,record|
tag_temp = tag.dup
filter_record(tag_temp, time, record)
out << format(tag_temp, time, record)
}
out
end
end
end
end
17 changes: 2 additions & 15 deletions lib/fluent/mixin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
require 'fluent/timezone'
require 'fluent/time'
require 'fluent/config/error'
require 'fluent/compat/record_filter_mixin'

module Fluent
class TimeFormatter
Expand Down Expand Up @@ -111,21 +112,7 @@ def format_nocache(time)
end
end


module RecordFilterMixin
def filter_record(tag, time, record)
end

def format_stream(tag, es)
out = ''
es.each {|time,record|
tag_temp = tag.dup
filter_record(tag_temp, time, record)
out << format(tag_temp, time, record)
}
out
end
end
RecordFilterMixin = Fluent::Compat::RecordFilterMixin

module HandleTagNameMixin
include RecordFilterMixin
Expand Down