Skip to content

Remove redundant semicolon #4992

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
daipom merged 1 commit into from
Jun 4, 2025
Merged

Remove redundant semicolon #4992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def acquire_worker_lock(name)
yield
end
# Update access time to prevent tmpwatch from deleting a lock file.
FileUtils.touch(lock_path);
FileUtils.touch(lock_path)
end

def string_safe_encoding(str)
Expand Down
2 changes: 1 addition & 1 deletion test/log/test_console_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def test_args(level)
def test_options(level)
@console_logger.send(level, "subject", kwarg1: "opt1", kwarg2: "opt2")
lines = @logdev.logs[0].split("\n")
args = JSON.parse(lines[1..].collect { |str| str.sub(/\s+\|/, "") }.join("\n"));
args = JSON.parse(lines[1..].collect { |str| str.sub(/\s+\|/, "") }.join("\n"))
assert_equal([
1,
"#{@timestamp_str} [#{level}]: 0.0s: subject",
Expand Down
2 changes: 1 addition & 1 deletion test/plugin/test_base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class FluentPluginBaseTest::DummyPlugin2 < Fluent::Plugin::TestBase
Dir.mktmpdir("test-fluentd-lock-") do |lock_dir|
ENV['FLUENTD_LOCK_DIR'] = lock_dir
p = FluentPluginBaseTest::DummyPlugin.new
path = p.get_lock_path("Aa\\|=~/_123");
path = p.get_lock_path("Aa\\|=~/_123")

assert_equal lock_dir, File.dirname(path)
assert_equal "fluentd-Aa______123.lock", File.basename(path)
Expand Down
14 changes: 7 additions & 7 deletions test/plugin/test_output_as_buffered_backup.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def wait_flush(target_file)
chunk_id = nil
@i.configure(config_element('ROOT', '', {'@id' => id}, [config_element('buffer', 'tag', hash)]))
@i.register(:write) { |chunk|
chunk_id = chunk.unique_id;
chunk_id = chunk.unique_id
raise error_class, "yay, your #write must fail"
}

Expand All @@ -220,7 +220,7 @@ def wait_flush(target_file)
secconf = config_element('secondary','',{'@type' => 'backup_output'})
@i.configure(config_element('ROOT', '', {'@id' => id}, [config_element('buffer', 'tag', hash), secconf]))
@i.register(:write) { |chunk|
chunk_id = chunk.unique_id;
chunk_id = chunk.unique_id
raise Fluent::UnrecoverableError, "yay, your #write must fail"
}

Expand All @@ -242,7 +242,7 @@ def wait_flush(target_file)
secconf = config_element('secondary', '', { '@type' => 'backup_output' })
@i.configure(config_element('ROOT', '', { '@id' => id }, [config_element('buffer', 'tag', hash), secconf]))
@i.register(:write) { |chunk|
chunk_id = chunk.unique_id;
chunk_id = chunk.unique_id
raise Fluent::UnrecoverableError, "yay, your #write must fail"
}

Expand All @@ -267,7 +267,7 @@ def wait_flush(target_file)
secconf = config_element('secondary', '', { '@type' => 'backup_output' })
@i.configure(config_element('ROOT', '', { '@id' => id }, [config_element('buffer', 'tag', hash), secconf]))
@i.register(:write) { |chunk|
chunk_id = chunk.unique_id;
chunk_id = chunk.unique_id
raise Fluent::UnrecoverableError, "yay, your #write must fail"
}

Expand All @@ -293,7 +293,7 @@ def wait_flush(target_file)
secconf = config_element('secondary','',{'@type' => 'backup_output2'})
@i.configure(config_element('ROOT', '', {'@id' => id}, [config_element('buffer', 'tag', hash), secconf]))
@i.register(:write) { |chunk|
chunk_id = chunk.unique_id;
chunk_id = chunk.unique_id
raise Fluent::UnrecoverableError, "yay, your #write must fail"
}
@i.secondary.register(:write) { |chunk|
Expand Down Expand Up @@ -322,7 +322,7 @@ def wait_flush(target_file)
secconf = config_element('secondary','',{'@type' => 'backup_async_output'})
@i.configure(config_element('ROOT', '', {'@id' => id}, [config_element('buffer', 'tag', hash), secconf]))
@i.register(:write) { |chunk|
chunk_id = chunk.unique_id;
chunk_id = chunk.unique_id
raise Fluent::UnrecoverableError, "yay, your #write must fail"
}

Expand All @@ -347,7 +347,7 @@ def wait_flush(target_file)
chunk_id = nil
@i.configure(config_element('ROOT', '', {'@id' => id}, [config_element('buffer', 'tag', hash)]))
@i.register(:write) { |chunk|
chunk_id = chunk.unique_id;
chunk_id = chunk.unique_id
raise Fluent::UnrecoverableError, "yay, your #write must fail"
}

Expand Down
Loading