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

connect our logger up to the charset converters #291

Merged
merged 1 commit into from
Jul 20, 2018
Merged
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
11 changes: 7 additions & 4 deletions lib/logstash/inputs/jdbc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,14 @@ def register
@jdbc_password = LogStash::Util::Password.new(File.read(@jdbc_password_filepath).strip) if @jdbc_password_filepath

if enable_encoding?
@converters = {}
@columns_charset.each do |column_name, encoding|
@converters[encoding] = LogStash::Util::Charset.new(encoding)
encodings = @columns_charset.values
encodings << @charset if @charset

@converters = encodings.each_with_object({}) do |encoding, converters|
converter = LogStash::Util::Charset.new(encoding)
converter.logger = self.logger
converters[encoding] = converter
end
@converters[@charset] = LogStash::Util::Charset.new(@charset) if @charset
end
end # def register

Expand Down