Skip to content

Use String#sub instead of String#sub! #64

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

Merged
merged 3 commits into from
Mar 12, 2019
Merged

Use String#sub instead of String#sub! #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d33a53d
Use String#sub instead of String#sub!
okkez Feb 12, 2019
b200721
test: Add group configure
okkez Feb 12, 2019
ea1b7bc
test: Add test about #63
okkez Feb 12, 2019
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/plugin/grok.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def expand_pattern(pattern)
else
replacement_pattern = "(?:#{curr_pattern})"
end
pattern.sub!(m[0]) do |s|
pattern = pattern.sub(m[0]) do |s|
replacement_pattern
end
end
Expand Down
58 changes: 35 additions & 23 deletions test/test_grok_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,37 +158,49 @@ class GrokParserTest < ::Test::Unit::TestCase
end
end

test "no grok patterns" do
assert_raise Fluent::ConfigError do
create_driver('')
sub_test_case "configure" do
test "no grok patterns" do
assert_raise Fluent::ConfigError do
create_driver('')
end
end

test "invalid config value type" do
assert_raise Fluent::ConfigError do
create_driver(%[
<grok>
pattern %{PATH:path:foo}
</grok>
])
end
end
end

test "invalid config value type" do
assert_raise Fluent::ConfigError do
create_driver(%[
test "invalid config value type and normal grok pattern" do
d = create_driver(%[
<grok>
pattern %{PATH:path:foo}
</grok>
<grok>
pattern %{IP:ip_address}
</grok>
])
assert_equal(1, d.instance.instance_variable_get(:@grok).parsers.size)
logs = $log.instance_variable_get(:@logger).instance_variable_get(:@logdev).logs
error_logs = logs.grep(/error_class/)
assert_equal(1, error_logs.size)
error_message = error_logs.first[/error="(.+)"/, 1]
assert_equal("unknown value conversion for key:'path', type:'foo'", error_message)
end
end

test "invalid config value type and normal grok pattern" do
d = create_driver(%[
<grok>
pattern %{PATH:path:foo}
</grok>
<grok>
pattern %{IP:ip_address}
</grok>
])
assert_equal(1, d.instance.instance_variable_get(:@grok).parsers.size)
logs = $log.instance_variable_get(:@logger).instance_variable_get(:@logdev).logs
error_logs = logs.grep(/error_class/)
assert_equal(1, error_logs.size)
error_message = error_logs.first[/error="(.+)"/, 1]
assert_equal("unknown value conversion for key:'path', type:'foo'", error_message)
test "keep original configuration" do
config = %[
<grok>
pattern %{INT:user_id:integer} paid %{NUMBER:paid_amount:float}
</grok>
]
d = create_driver(config)
assert_equal("%{INT:user_id:integer} paid %{NUMBER:paid_amount:float}", d.instance.config.elements("grok").first["pattern"])
end
end

sub_test_case "grok_name_key" do
Expand Down