Merge pull request #478 from fluent/fix_multiple_tag_match

fix v1 config to support multiple tag match
fluent · Nov 21, 2014 · 8c7bc1c · 8c7bc1c
2 parents 2f8f423 + e40f9a6
commit 8c7bc1c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/lib/fluent/config/basic_parser.rb b/lib/fluent/config/basic_parser.rb
@@ -27,6 +27,7 @@ def initialize(strscan)
 
       LINE_END = /(?:[ \t]*(?:\#.*)?(?:\z|[\r\n]))+/
       SPACING = /(?:[ \t\r\n]|\z|\#.*?(?:\z|[\r\n]))+/
+      ZERO_OR_MORE_SPACING = /(?:[ \t\r\n]|\z|\#.*?(?:\z|[\r\n]))*/
       SPACING_WITHOUT_COMMENT = /(?:[ \t\r\n]|\z)+/
 
       module ClassMethods

diff --git a/lib/fluent/config/v1_parser.rb b/lib/fluent/config/v1_parser.rb
@@ -79,7 +79,7 @@ def parse_element(root_element, elem_name, attrs = {}, elems = [])
           elsif skip(/\</)
             e_name = scan(ELEMENT_NAME)
             spacing
-            e_arg = scan_nonquoted_string(/(?:#{SPACING}|\>)/)
+            e_arg = scan_nonquoted_string(/(?:#{ZERO_OR_MORE_SPACING}\>)/)
             spacing
             unless skip(/\>/)
               parse_error! "expected '>'"

diff --git a/test/config/test_config_parser.rb b/test/config/test_config_parser.rb
@@ -1,6 +1,6 @@
-require 'helper'
+require_relative '../helper'
+require_relative "assertions"
 require "json"
-require "config/assertions"
 require "fluent/config/error"
 require "fluent/config/basic_parser"
 require "fluent/config/literal_parser"
@@ -229,6 +229,10 @@ def test_not_reject_at_prefix_in_the_parameter_name(data)
         "ignores spacing around element argument" => [root(e("test", "a")), %[
           <test    a    >
           </test>
+        ]],
+        "accepts spacing inside element argument (for multiple tags)" => [root(e("test", "a.** b.**")), %[
+          <test    a.** b.** >
+          </test>
         ]])
       def test_parse_element(data)
         expected, target = data

diff --git a/test/test_plugin_classes.rb b/test/test_plugin_classes.rb
@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 
 module FluentTest
   class FluentTestOutput < ::Fluent::Output