Merge pull request #42 from kimamula/fix_issue_40

Fix #40
sonots · Aug 21, 2016 · 074e288 · 074e288
2 parents c260fc3 + da2780d
commit 074e288
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/fluent/plugin/out_record_reformer.rb b/lib/fluent/plugin/out_record_reformer.rb
@@ -219,7 +219,7 @@ def prepare_placeholders(placeholder_values)
             end
           elsif value.kind_of?(Hash) # record, etc
             value.each do |k, v|
-              placeholders.store("${#{k}}", v) # foo
+              placeholders.store("${#{k}}", v) unless placeholder_values.key?(k) # foo (Prevent overriding the reserved placeholders with 'unless' check)
               placeholders.store(%Q[${#{key}["#{k}"]}], v) # record["foo"]
             end
           else # string, interger, float, and others?

diff --git a/test/test_out_record_reformer.rb b/test/test_out_record_reformer.rb
@@ -28,6 +28,7 @@ def emit(config, use_v1, msgs = [''])
         record = {
           'eventType0' => 'bar',
           'message'    => msg,
+          'tag'        => 'baz',
         }
         record = record.merge(msg) if msg.is_a?(Hash)
         d.emit(record, @time)