Merge pull request #252 from okkez/add-missing-require

Add missing require
This commit is contained in:
okkez 2018-07-19 15:00:40 +09:00 committed by GitHub
commit ad0fa80b99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 1 deletions

View File

@ -162,7 +162,11 @@ class Fluentd
else
type
end
Fluent::Config::REFORMAT_VALUE.call(type_name, value.dup)
begin
Fluent::Config::REFORMAT_VALUE.call(type_name, value.dup)
rescue TypeError
Fluent::Config::REFORMAT_VALUE.call(type_name, value)
end
end
end
end

View File

@ -0,0 +1,8 @@
unless {}.respond_to?(:dig)
begin
# backport_dig is faster than dig_rb so prefer backport_dig.
require 'backport_dig'
rescue LoadError
require 'dig_rb'
end
end

View File

@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "fluentd", [">= 1.0.0", "< 2"]
spec.add_dependency 'rails', '~> 5.2.0'
spec.add_dependency "dig_rb", "~> 1.0.0"
spec.add_dependency "bootsnap", ">= 1.1.0"
spec.add_dependency 'sucker_punch', "~> 2.0.4"
spec.add_dependency 'addressable'

View File

@ -24,6 +24,7 @@ Capybara.javascript_driver = :selenium
require 'capybara-screenshot/rspec'
require "fluent/load"
require "fluent/plugin/buf_file"
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.