Skip to content

do not add fields if the key_name does not exist #7

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

Open
ricardojover wants to merge 1 commit into
base: master
Choose a base branch
from
Open

do not add fields if the key_name does not exist #7

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
32 changes: 17 additions & 15 deletions lib/fluent/plugin/filter_woothee.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,23 @@ def filter_fast_crawler(tag, time, record)
end

def filter_standard(tag, time, record)
parsed = Woothee.parse(record[@key_name] || '')

category = parsed[Woothee::ATTRIBUTE_CATEGORY]
return nil if @mode == :filter && !@filter_categories.include?(category)
return nil if @mode == :drop && @drop_categories.include?(category)

if @merge_agent_info
record = record.merge({
@out_key_name => parsed[Woothee::ATTRIBUTE_NAME],
@out_key_category => parsed[Woothee::ATTRIBUTE_CATEGORY].to_s,
@out_key_os => parsed[Woothee::ATTRIBUTE_OS]
})
record[@out_key_os_version] = parsed[Woothee::ATTRIBUTE_OS_VERSION] if @out_key_os_version
record[@out_key_version] = parsed[Woothee::ATTRIBUTE_VERSION] if @out_key_version
record[@out_key_vendor] = parsed[Woothee::ATTRIBUTE_VENDOR] if @out_key_vendor
if record[@key_name]
parsed = Woothee.parse(record[@key_name] || '')

category = parsed[Woothee::ATTRIBUTE_CATEGORY]
return nil if @mode == :filter && !@filter_categories.include?(category)
return nil if @mode == :drop && @drop_categories.include?(category)

if @merge_agent_info
record = record.merge({
@out_key_name => parsed[Woothee::ATTRIBUTE_NAME],
@out_key_category => parsed[Woothee::ATTRIBUTE_CATEGORY].to_s,
@out_key_os => parsed[Woothee::ATTRIBUTE_OS]
})
record[@out_key_os_version] = parsed[Woothee::ATTRIBUTE_OS_VERSION] if @out_key_os_version
record[@out_key_version] = parsed[Woothee::ATTRIBUTE_VERSION] if @out_key_version
record[@out_key_vendor] = parsed[Woothee::ATTRIBUTE_VENDOR] if @out_key_vendor
end
end
record
end
Expand Down