Skip to content

Commit

Permalink
Merge pull request #1643 from ryysud/fix-typo
Browse files Browse the repository at this point in the history
Fix typo
  • Loading branch information
repeatedly authored Jul 26, 2017
2 parents e9709fb + 1d6731e commit 9681917
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/fluent/plugin/output.rb
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ def extract_placeholders(str, metadata)
rvalue = rvalue.gsub(CHUNK_KEY_PLACEHOLDER_PATTERN, hash)
end
if rvalue =~ CHUNK_KEY_PLACEHOLDER_PATTERN
log.warn "chunk key placeholder '#{$1}' not replaced. templace:#{str}"
log.warn "chunk key placeholder '#{$1}' not replaced. template:#{str}"
end
rvalue
end
Expand Down
2 changes: 1 addition & 1 deletion test/plugin/test_output.rb
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ def waiting(seconds)
end

sub_test_case '#placeholder_validate!' do
test 'raises configuration error for a templace when timestamp placeholders exist but time key is missing' do
test 'raises configuration error for a template when timestamp placeholders exist but time key is missing' do
@i.configure(config_element('ROOT', '', {}, [config_element('buffer', '')]))
assert_raise Fluent::ConfigError.new("Parameter 'path: /path/without/timestamp/file.%Y%m%d-%H%M.log' has timestamp placeholders, but chunk key 'time' is not configured") do
@i.placeholder_validate!(:path, "/path/without/timestamp/file.%Y%m%d-%H%M.log")
Expand Down

0 comments on commit 9681917

Please sign in to comment.