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

Use dig_rb instead of ruby_dig when backport_dig is not installed #1794

Merged
merged 1 commit into from
Dec 18, 2017
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
2 changes: 1 addition & 1 deletion fluentd.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency("tzinfo", ["~> 1.0"])
gem.add_runtime_dependency("tzinfo-data", ["~> 1.0"])
gem.add_runtime_dependency("strptime", ["~> 0.1"])
gem.add_runtime_dependency("ruby_dig", ["~> 0.0.2"])
gem.add_runtime_dependency("dig_rb", ["~> 1.0.0"])

# build gem for a certain platform. see also Rakefile
fake_platform = ENV['GEM_BUILD_FAKE_PLATFORM'].to_s
Expand Down
4 changes: 2 additions & 2 deletions lib/fluent/plugin_helper/record_accessor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
require 'fluent/config/error'
unless {}.respond_to?(:dig)
begin
# backport_dig is faster than ruby_dig so prefer backport_dig.
# backport_dig is faster than dig_rb so prefer backport_dig.
require 'backport_dig'
rescue LoadError
require 'ruby_dig'
require 'dig_rb'
end
end

Expand Down