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

Fix for rotate_age where Fluentd passes as Symbol #4311

Merged
merged 5 commits into from
Oct 18, 2023
Merged

Fix for rotate_age where Fluentd passes as Symbol #4311

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
20d62f6
Fix for rotate_age where Fluentd passes as Symbol while Ruby Logger e…
mrudrego Sep 26, 2023
c7bc6a3
Update system_config.rb
mrudrego Sep 27, 2023
70cf9bb
Update test_system_config.rb
mrudrego Sep 28, 2023
c921df5
Addressed review comments
mrudrego Oct 17, 2023
7353b21
Update system_config.rb
mrudrego Oct 17, 2023
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/system_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class SystemConfig
config_param :time_format, :string, default: '%Y-%m-%d %H:%M:%S %z'
config_param :rotate_age, default: nil do |v|
if Fluent::Log::LOG_ROTATE_AGE.include?(v)
v.to_sym
v
else
begin
Integer(v)
Expand Down
4 changes: 2 additions & 2 deletions test/config/test_system_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def parse_text(text)
data('daily' => "daily",
'weekly' => 'weekly',
'monthly' => 'monthly')
test "symbols for rotate_age" do |age|
test "strings for rotate_age" do |age|
conf = parse_text(<<-EOS)
<system>
<log>
Expand All @@ -160,7 +160,7 @@ def parse_text(text)
</system>
EOS
sc = Fluent::SystemConfig.new(conf)
assert_equal(age.to_sym, sc.log.rotate_age)
assert_equal(age, sc.log.rotate_age)
end

test "numeric number for rotate age" do
Expand Down
Loading