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.

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

Jump to bottom

Add null check for logger #1332

Merged
merged 5 commits into from
Dec 6, 2016
Merged

Add null check for logger #1332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a580500
Add null check for `logger`
okkez Nov 28, 2016
4cf96bd
Add assertion for error log
okkez Nov 28, 2016
12f92c1
Add test for logger is nil
okkez Nov 28, 2016
ae7db9c
Fix test description
okkez Nov 28, 2016
afb251f
Fix assertion
okkez Dec 1, 2016
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 lib/fluent/config/section.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def self.generate(proxy, conf, logger, plugin_class, stack = [])
# because they are expected to be removed entirely sometime in the future.
# Obsoleted: These obsolete features have been entirely removed from JavaScript and can no longer be used.
if opts[:deprecated]
logger.warn "'#{name}' parameter is deprecated: #{opts[:deprecated]}"
logger.warn "'#{name}' parameter is deprecated: #{opts[:deprecated]}" if logger
end
if opts[:obsoleted]
logger.error "config error in:\n#{conf}" if logger
Expand Down
20 changes: 20 additions & 0 deletions test/config/test_configurable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,6 +1295,26 @@ class Buggy1
assert_raise Fluent::ObsoletedParameterError.new("'key2' parameter is already removed: key2 has been removed.") do
obj.configure(config_element('ROOT', '', {'key2' => 'yay'}, []))
end
first_log = obj.log.logs.first
assert{ first_log && first_log.include?("[error]") && first_log.include?("config error in:\n<ROOT>\n key2 yay\n</ROOT>") }
end

sub_test_case 'logger is nil' do
test 'nothing raised if deprecated parameter is configured' do
obj = ConfigurableSpec::UnRecommended.new
obj.log = nil
obj.configure(config_element('ROOT', '', {'key1' => 'yay'}, []))
assert_nil(obj.log)
end

test 'NoMethodError is not raised if obsoleted parameter is configured' do
obj = ConfigurableSpec::UnRecommended.new
obj.log = nil
assert_raise Fluent::ObsoletedParameterError.new("'key2' parameter is already removed: key2 has been removed.") do
obj.configure(config_element('ROOT', '', {'key2' => 'yay'}, []))
end
assert_nil(obj.log)
end
end
end

Expand Down