fluentd 0.12.11 → 0.12.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f332fd6ebffa5a9f9c318f90e3a14aeca817bd06
-  data.tar.gz: ebf638f6375958a66a285003c4dee6a193fd9914
+  metadata.gz: 1c5d20fa9a07887680fe5d8b7b5e6982c7abf515
+  data.tar.gz: a8db7dc9f26fcd657e02c99a457bc00c66757176
 SHA512:
-  metadata.gz: 6e942e48b3aefbe52818f48827a87efb1f78d0037aaca0ab19612649a2db2e0ab060750ef2c14e36bec96c3ebe9bda3f1eb9d8d8d78701c9e4f3b24ca07e1e65
-  data.tar.gz: 3f1d85a56f16fd280da534cdca74f98cb761c59b77abe9f232b13e677fd774bb0fe97eafed3692ff0b1b78d5b259ba99f5528e5eb68031c41e6f33c97422f10f
+  metadata.gz: df6783a7ae988dba16ae804cafd1750af435cbd3c89c8bce2ead550ece11addf1f0539637bcf119510d87db732eeb4f9ee58e97b03c5cce5e7437bc5af9a028b
+  data.tar.gz: b2a2c418a054dedcb654c6fb2ca93e568c39651774bb14bfe2465a630533a7108faa5b9414a228b4c0e188b850212a4622ea83f44766db26dac52d29dffedd24

data/ChangeLog

@@ -1,6 +1,20 @@
 # v0.12
 
-## Release 0.12.10 - 2015/06/01
+## Release 0.12.12 - 2015/06/12
+
+### New features / Enhancement
+
+* in_forward: Add chunk format check
+  https://github.com/fluent/fluentd/pull/611
+
+### Bug fixes
+
+* formatter: Fix SingleValueFormatter to prevent record from modified
+  https://github.com/fluent/fluentd/pull/615
+* config: configure requires Config::Element, not Hash
+  https://github.com/fluent/fluentd/pull/616
+
+## Release 0.12.11 - 2015/06/01
 
 ### New features / Enhancement
 

data/lib/fluent/formatter.rb

@@ -206,7 +206,7 @@ module Fluent
       config_param :add_newline, :bool, :default => true
 
       def format(tag, time, record)
-        text = record[@message_key].to_s
+        text = record[@message_key].to_s.dup
         text << "\n" if @add_newline
         text
       end

data/lib/fluent/parser.rb

@@ -168,6 +168,7 @@ module Fluent
         super()
         @regexp = regexp
         unless conf.empty?
+          conf = Config::Element.new('default_regexp_conf', '', conf, [])
           configure(conf)
         end
 

data/lib/fluent/plugin/in_forward.rb

@@ -125,7 +125,12 @@ module Fluent
         return
       end
 
-      # TODO format error
+      # TODO: raise an exception if broken chunk is generated by recoverable situation
+      unless msg.is_a?(Array)
+        log.warn "incoming chunk is broken:", source: source, msg: msg
+        return
+      end
+
       tag = msg[0].to_s
       entries = msg[1]
 

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.11'
+  VERSION = '0.12.12'
 
 end

data/test/plugin/test_in_forward.rb

@@ -200,6 +200,26 @@ class ForwardInputTest < Test::Unit::TestCase
     }.size == 1, "large chunk warning is not logged"
   end
 
+  data('string chunk' => 'broken string',
+       'integer chunk' => 10)
+  def test_send_broken_chunk(data)
+    d = create_driver
+
+    # d.run => send_data
+    d.run do
+      d.instance.send(:on_message, data, 1000000000, "host: 127.0.0.1, addr: 127.0.0.1, port: 0000")
+    end
+
+    # check emitted data
+    emits = d.emits
+    assert_equal 0, emits.size
+
+    # check log
+    assert d.instance.log.logs.select{|line|
+      line =~ / \[warn\]: incoming chunk is broken: source="host: 127.0.0.1, addr: 127.0.0.1, port: \d+" msg=#{data.inspect}/
+    }.size == 1, "should not accept broken chunk"
+  end
+
   def test_respond_to_message_requiring_ack
     d = create_driver
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.11
+  version: 0.12.12
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack