fluentd 0.10.54 → 0.10.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a362e48a2716bb0892c742fd3e1a3ba78c943c80
-  data.tar.gz: 4bebdc013320b9e06be09fa93b52e83e95ee814f
+  metadata.gz: 8f6c7392b51882506144d22dbef860923ca396a8
+  data.tar.gz: 57b91cf45454978c20ae3a497502c2b41580d29d
 SHA512:
-  metadata.gz: a67253d1567eb3f934d2740271c3e1355a1df08b0638809e5add6b9e739f1f99aee1fa27896f9aac798c659f5dc7ce38f943654c5299a8af63ca679c3158f260
-  data.tar.gz: f32dd1c438f4a6f0598182d0a26d712f05cd1782a3eeebad4d32026529668e8212b4cf0269361646c440b1b3cae8e0e5b46b89cff8e2ba4e7334e42a819953af
+  metadata.gz: 09247456a29976eec30ca20b77f69bc5179a82fdbe1052133234e7b926bb8fd403bf951ea478d0fc0a9f4ba54cbfded565bf653717b350178ada538c08baac6c
+  data.tar.gz: 8f9dd61a23a67c4e90b937cdfa5d7ed881f54853ae1fe9b942f0b19e648472f8714d394af6ed21e5848b9a0a245af86974d55a28760da3c759a5e3eadf7ad671

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.10.55 - 2014/10/17
+
+* config: Relax '@' handling in the plugin configuration for backward compatibility
+
 Release 0.10.54 - 2014/10/17
 
 * config: Change v1's non-quoted string literal behaviour to v0's behaviour

data/lib/fluent/config/v1_parser.rb

@@ -49,6 +49,8 @@ module Fluent
         return root
       end
 
+      ELEM_SYMBOLS = ['match', 'source', 'filter', 'system']
+
       def parse_element(root_element, elem_name, attrs = {}, elems = [])
         while true
           spacing
@@ -107,7 +109,12 @@ module Fluent
                 parse_include(attrs, elems)
               else
                 if k.start_with?('@')
-                  parse_error! "'@' is reserved prefix. Don't use '@' in parameter name"
+                  if root_element || ELEM_SYMBOLS.include?(elem_name)
+                    parse_error! "'@' is the system reserved prefix. Don't use '@' prefix parameter in the configuration: #{k}"
+                  else
+                    # TODO: This is for backward compatibility. It will throw an error in the future.
+                    $log.warn "'@' is the system reserved prefix. It works in the nested configuration for now but it will be rejected: #{k}"
+                  end
                 end
 
                 v = parse_literal

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-  VERSION = '0.10.54'
+  VERSION = '0.10.55'
 
 end

data/test/config/test_config_parser.rb

@@ -154,8 +154,39 @@ module Fluent::Config
         end
       end
 
-      test "rejects @ prefix in parameter name" do
-        assert_parse_error('  @k v')
+      data(
+        "in match" => %[
+          <match>
+            @k v
+          </match>
+        ],
+        "in source" => %[
+          <source>
+            @k v
+          </source>
+        ],
+        "in filter" => %[
+          <filter>
+            @k v
+          </filter>
+        ],
+        "in top-level" => '  @k v '
+        )
+      def test_rejects_at_prefix_in_the_parameter_name(data)
+        assert_parse_error(data)
+      end
+
+      data(
+        "in nested" => %[
+          <match>
+            <record>
+              @k v
+            </record>
+          </match>
+        ]
+        )
+      def test_not_reject_at_prefix_in_the_parameter_name(data)
+        assert_nothing_raised { parse_text(data) }
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.54
+  version: 0.10.55
 platform: ruby
 authors:
 - Sadayuki Furuhashi