Skip to content

Setting tag_key to a non-existing field causes a ruby error. #12

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
nhosoi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Setting tag_key to a non-existing field causes a ruby error. #12

Show file tree
Hide file tree
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
14 changes: 9 additions & 5 deletions lib/fluentd/plugin/out_syslog.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,15 @@ def emit(tag, es, chain)
time = Time.now
end
@packet.time = time
@packet.tag = if tag_key
record[tag_key][0..31].gsub(/[\[\]]/,'') # tag is trimmed to 32 chars for syslog_protocol gem compatibility
else
tag[0..31] # tag is trimmed to 32 chars for syslog_protocol gem compatibility
end
@packet.tag = if @tag_key
begin
record[@tag_key][0..31].gsub(/[\[\]]/,'') # tag is trimmed to 32 chars for syslog_protocol gem compatibility
rescue
tag[0..31] # tag is trimmed to 32 chars for syslog_protocol gem compatibility
end
else
tag[0..31] # tag is trimmed to 32 chars for syslog_protocol gem compatibility
end
packet = @packet.dup
packet.content = record[@payload_key]
@socket.send(packet.assemble, 0, @remote_syslog, @port)
Expand Down
14 changes: 9 additions & 5 deletions lib/fluentd/plugin/out_syslog_buffered.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,15 @@ def send_to_syslog(tag, time, record)
time = Time.now
end
@packet.time = time
@packet.tag = if tag_key
record[tag_key][0..31].gsub(/[\[\]]/,'') # tag is trimmed to 32 chars for syslog_protocol gem compatibility
else
tag[0..31] # tag is trimmed to 32 chars for syslog_protocol gem compatibility
end
@packet.tag = if @tag_key
begin
record[@tag_key][0..31].gsub(/[\[\]]/,'') # tag is trimmed to 32 chars for syslog_protocol gem compatibility
rescue
tag[0..31] # tag is trimmed to 32 chars for syslog_protocol gem compatibility
end
else
tag[0..31] # tag is trimmed to 32 chars for syslog_protocol gem compatibility
end
packet = @packet.dup
packet.content = record[@payload_key]
begin
Expand Down