fluentd 0.10.61 → 0.10.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b40111b5009cbd336262c568c0cbe69bb3e34b42
-  data.tar.gz: ad517f5db8a4b674e6b7b73ff731f8ad2a6a451c
+  metadata.gz: cd3088d98e7106ccaf044045d71999404e1357c5
+  data.tar.gz: f232ac836fea58e4719174883df438e2be8c9202
 SHA512:
-  metadata.gz: cac0ecda9b4b25e13f05f1c4c65b68e32cec4fd0971296169207b546a0d498cbca3d28322bef27c77f5ddd29f8c041fb7ea7095e014e439feb2c17efbb995ade
-  data.tar.gz: f2e6719f05fad72dd193433a716caee375a1f07077b22907a17d3dd41ff0b79427f6e2aa0768e4df945298f2316fcc5ec153dd86f708b430e3969f5362510659
+  metadata.gz: 55e3054d9f035d210a8c40dca48dd0067749b3d942e8bc6bed63425d8898c11146cca21491d7a32aa614a2d4270dd8ad2f8c7b2e23a06f65ebc0d98b12b53a2e
+  data.tar.gz: eb6293c1d478b3b384badba7024fe68d319797e37c6bebbc12dc7f1cbb89153776cd512b21b9f6ba7f449072906cadbe8907e244be0b76b37eb5bd56e5e1026a

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.10.62 - 2016/12/15
+
+* Fix gem dependency to fix broken installation
+
 Release 0.10.61 - 2015/03/03
 
 * out_forward: Should handle ECONNREFUSED exeception on TCP heartbeat

data/fluentd.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency("msgpack", [">= 0.4.4", "!= 0.5.0", "!= 0.5.1", "!= 0.5.2", "!= 0.5.3", "!= 0.5.4",
                                          "!= 0.5.5", "!= 0.5.6", "!= 0.5.7", "!= 0.5.8", "!= 0.5.9", "!= 0.5.10", "< 0.6.0"])
-  gem.add_runtime_dependency("json", [">= 1.4.3"])
+  gem.add_runtime_dependency("json", [">= 1.4.3", "< 2.0.0"])
   gem.add_runtime_dependency("yajl-ruby", ["~> 1.0"])
   gem.add_runtime_dependency("cool.io", [">= 1.1.1", "!= 1.2.0", "< 2.0.0"])
   gem.add_runtime_dependency("http_parser.rb", [">= 0.5.1", "< 0.7.0"])
@@ -29,10 +29,10 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency("tzinfo-data", [">= 1.0.0"])
 
   gem.add_development_dependency("rake", [">= 0.9.2"])
-  gem.add_development_dependency("flexmock")
-  gem.add_development_dependency("parallel_tests", [">= 0.15.3"])
+  gem.add_development_dependency("flexmock", ["< 2.0.0"])
+  gem.add_development_dependency("parallel_tests", [">= 0.15.3", "< 2.0.0"])
   gem.add_development_dependency("simplecov", ["~> 0.6.4"])
-  gem.add_development_dependency("rr", [">= 1.0.0"])
+  gem.add_development_dependency("rr", ["~> 1.1.2"])
   gem.add_development_dependency("timecop", [">= 0.3.0"])
   gem.add_development_dependency("test-unit", ["~> 3.0.2"])
 end

data/lib/fluent/config/configure_proxy.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Config
     class ConfigureProxy
-      attr_accessor :name, :param_name, :required, :multi, :alias, :argument, :params, :defaults, :sections
+      attr_accessor :name, :final, :param_name, :required, :multi, :alias, :argument, :params, :defaults, :sections
       # config_param :desc, :string, :default => '....'
       # config_set_default :buffer_type, :memory
       #
@@ -22,6 +22,7 @@ module Fluent
 
       def initialize(name, opts = {})
         @name = name.to_sym
+        @final = opts.fetch(:final, false)
 
         @param_name = (opts[:param_name] || @name).to_sym
         @required = opts[:required]
@@ -42,7 +43,13 @@ module Fluent
         @multi.nil? ? true : @multi
       end
 
+      def final?
+        @final
+      end
+
       def merge(other) # self is base class, other is subclass
+        return merge_for_finalized(other) if self.final?
+
         options = {
           param_name: other.param_name,
           required: (other.required.nil? ? self.required : other.required),
@@ -53,7 +60,52 @@ module Fluent
         merged.argument = other.argument || self.argument
         merged.params = self.params.merge(other.params)
         merged.defaults = self.defaults.merge(other.defaults)
-        merged.sections = self.sections.merge(other.sections)
+        merged.sections = {}
+        (self.sections.keys + other.sections.keys).uniq.each do |section_key|
+          self_section = self.sections[section_key]
+          other_section = other.sections[section_key]
+          merged_section = if self_section && other_section
+                             self_section.merge(other_section)
+                           elsif self_section || other_section
+                             self_section || other_section
+                           else
+                             raise "BUG: both of self and other section are nil"
+                           end
+          merged.sections[section_key] = merged_section
+        end
+
+        merged
+      end
+
+      def merge_for_finalized(other)
+        # list what subclass can do for finalized section
+        #  * overwrite param_name to escape duplicated name of instance variable
+        #  * append params/defaults/sections which are missing in superclass
+
+        options = {
+          param_name: other.param_name,
+          required: (self.required.nil? ? other.required : self.required),
+          multi: (self.multi.nil? ? other.multi : self.multi),
+          final: true,
+        }
+        merged = self.class.new(other.name, options)
+
+        merged.argument = self.argument || other.argument
+        merged.params = other.params.merge(self.params)
+        merged.defaults = other.defaults.merge(self.defaults)
+        merged.sections = {}
+        (self.sections.keys + other.sections.keys).uniq.each do |section_key|
+          self_section = self.sections[section_key]
+          other_section = other.sections[section_key]
+          merged_section = if self_section && other_section
+                             other_section.merge(self_section)
+                           elsif self_section || other_section
+                             self_section || other_section
+                           else
+                             raise "BUG: both of self and other section are nil"
+                           end
+          merged.sections[section_key] = merged_section
+        end
 
         merged
       end

data/lib/fluent/config/literal_parser.rb

@@ -146,7 +146,7 @@ module Fluent
 
         @ss.pos += code.length
 
-        code
+        '"#{' + code + '}"'
       end
 
       def eval_embedded_code(code)

data/lib/fluent/output.rb

@@ -94,7 +94,7 @@ module Fluent
     def initialize(output)
       @output = output
       @finish = false
-      @next_time = Engine.now + 1.0
+      @next_time = Time.now.to_f + 1.0
     end
 
     def configure(conf)
@@ -128,7 +128,7 @@ module Fluent
       @mutex.lock
       begin
         until @finish
-          time = Engine.now
+          time = Time.now.to_f
 
           if @next_time <= time
             @mutex.unlock
@@ -137,7 +137,7 @@ module Fluent
             ensure
               @mutex.lock
             end
-            next_wait = @next_time - Engine.now
+            next_wait = @next_time - Time.now.to_f
           else
             next_wait = @next_time - time
           end
@@ -226,7 +226,7 @@ module Fluent
     end
 
     def start
-      @next_flush_time = Engine.now + @flush_interval
+      @next_flush_time = Time.now.to_f + @flush_interval
       @buffer.start
       @secondary.start if @secondary
       @writers.each {|writer| writer.start }
@@ -275,10 +275,10 @@ module Fluent
     end
 
     def try_flush
-      time = Engine.now
+      time = Time.now.to_f
 
       empty = @buffer.queue_size == 0
-      if empty && @next_flush_time < (now = Engine.now)
+      if empty && @next_flush_time < (now = Time.now.to_f)
         @buffer.synchronize do
           if @next_flush_time < now
             enqueue_buffer
@@ -325,7 +325,7 @@ module Fluent
         end
 
         if has_next
-          return Engine.now + @queued_chunk_flush_interval
+          return Time.now.to_f + @queued_chunk_flush_interval
         else
           return time + @try_flush_interval
         end
@@ -380,7 +380,7 @@ module Fluent
 
     def force_flush
       @num_errors_lock.synchronize do
-        @next_retry_time = Engine.now - 1
+        @next_retry_time = Time.now.to_f - 1
       end
       enqueue_buffer(true)
       submit_flush

data/lib/fluent/plugin/in_tail.rb

@@ -27,6 +27,7 @@ module Fluent
 
     config_param :path, :string
     config_param :tag, :string
+    config_param :exclude_path, :array, :default => []
     config_param :rotate_wait, :time, :default => 5
     config_param :pos_file, :string, :default => nil
     config_param :read_from_head, :bool, :default => false
@@ -100,6 +101,8 @@ module Fluent
     def expand_paths
       date = Time.now
       paths = []
+
+      excluded = @exclude_path.map { |path| path = date.strftime(path); path.include?('*') ? Dir.glob(path) : path }.flatten.uniq
       @paths.each { |path|
         path = date.strftime(path)
         if path.include?('*')
@@ -109,7 +112,7 @@ module Fluent
           paths << path
         end
       }
-      paths
+      paths - excluded
     end
 
     # in_tail with '*' path doesn't check rotation file equality at refresh phase.

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-  VERSION = '0.10.61'
+  VERSION = '0.10.62'
 
 end

data/test/config/test_configurable.rb

@@ -100,14 +100,45 @@ module ConfigurableSpec
 
     config_param :name, :string, alias: :fullname
     config_param :bool, :bool, alias: :flag
-    config_section :detail, required: true, multi: false, alias: "information" do
-      config_param :address, :string
+    config_section :detail, required: false, multi: false, alias: "information" do
+      config_param :address, :string, default: "x"
     end
 
     def get_all
       [@name, @detail]
     end
   end
+
+  class Example2 < Example1
+    config_section :detail, required: true, multi: false, alias: "information2" do
+      config_param :address, :string, default: "y"
+      config_param :phone_no, :string
+    end
+  end
+
+  class Example3
+    include Fluent::Configurable
+
+    config_param :age, :integer, default: 10
+
+    config_section :appendix, required: true, multi: false, final: true do
+      config_param :type, :string
+      config_param :name, :string, default: "x"
+    end
+
+    def get_all
+      [@name, @detail]
+    end
+  end
+
+  class Example4 < Example3
+    config_param :age, :integer, default: 20
+
+    config_section :appendix, required: false, multi: false, final: false do
+      config_param :name, :string, default: "y"
+      config_param :age, :integer, default: 10
+    end
+  end
 end
 
 module Fluent::Config
@@ -493,6 +524,97 @@ module Fluent::Config
           assert_false(ex5.boolvalue)
         end
       end
+
+      sub_test_case '.config_section' do
+        def e(name, arg = '', attrs = {}, elements = [])
+          attrs_str_keys = {}
+          attrs.each{|key, value| attrs_str_keys[key.to_s] = value }
+          Fluent::Config::Element.new(name, arg, attrs_str_keys, elements)
+        end
+
+        test 'subclass configuration spec can overwrite superclass specs' do
+          # conf0 = e('ROOT', '', {}, [])
+
+          conf1 = e('ROOT', '', {
+              'name' => 'tagomoris',
+              'bool' => true,
+            },
+          )
+          # <detail> section is required by overwriting of Example2 config_section spec
+          assert_nothing_raised { ConfigurableSpec::Example1.new.configure(conf1) }
+          assert_raise(Fluent::ConfigError.new("'<detail>' sections are required")) { ConfigurableSpec::Example2.new.configure(conf1) }
+
+          conf2 = e('ROOT', '', {
+              'name' => 'tagomoris',
+              'bool' => true,
+            },
+            [e('detail', '', { 'phone_no' => "+81-00-0000-0000" }, [])],
+          )
+          # <detail> address </detail> default is overwritten by Example2
+          assert_nothing_raised { ConfigurableSpec::Example1.new.configure(conf2) }
+          assert_nothing_raised { ConfigurableSpec::Example2.new.configure(conf2) }
+          ex1 = ConfigurableSpec::Example1.new.configure(conf2)
+          assert_equal "x", ex1.detail.address
+          ex2 = ConfigurableSpec::Example2.new.configure(conf2)
+          assert_equal "y", ex2.detail.address
+
+          conf3 = e('ROOT', '', {
+              'name' => 'tagomoris',
+              'bool' => true,
+            },
+            [e('detail', '', { 'address' => "Chiyoda Tokyo Japan" }, [])],
+          )
+          # <detail> phone_no </detail> is required by Example2 config_param spec
+          assert_nothing_raised { ConfigurableSpec::Example1.new.configure(conf3) }
+          assert_raise(Fluent::ConfigError.new("'phone_no' parameter is required, in section detail")) { ConfigurableSpec::Example2.new.configure(conf3) }
+
+          conf4 = e('ROOT', '', {
+              'name' => 'tagomoris',
+              'bool' => true,
+            },
+            [e('detail', '', { 'address' => "Chiyoda Tokyo Japan", 'phone_no' => '+81-00-0000-0000' }, [])],
+          )
+          assert_nothing_raised { ConfigurableSpec::Example1.new.configure(conf4) } # phone_no is not used
+          assert_nothing_raised { ConfigurableSpec::Example2.new.configure(conf4) }
+
+          ex2 = ConfigurableSpec::Example2.new.configure(conf4)
+          assert_equal "Chiyoda Tokyo Japan", ex2.detail.address
+          assert_equal "+81-00-0000-0000", ex2.detail.phone_no
+        end
+
+        test 'adds only config_param definitions into configuration without overwriting existing finalized configuration elements' do
+
+          conf1 = e('ROOT', '', {}, [])
+          # <appendix> is required by Example3 and its not be overwritten by Example4
+          assert_raise(Fluent::ConfigError.new("'<appendix>' sections are required")) { ConfigurableSpec::Example3.new.configure(conf1) }
+          assert_raise(Fluent::ConfigError.new("'<appendix>' sections are required")) { ConfigurableSpec::Example4.new.configure(conf1) }
+
+          conf2 = e('ROOT', '', {
+            },
+            [e('appendix', '', {'type' => '1'}, [])],
+          )
+          # default value of age is overwritten by Example4, because root proxy is not finalized
+          ex3 = ConfigurableSpec::Example3.new.configure(conf2)
+          assert_equal 10, ex3.age
+          assert_equal '1', ex3.appendix.type
+          ex4 = ConfigurableSpec::Example4.new.configure(conf2)
+          assert_equal 20, ex4.age
+          assert_equal '1', ex4.appendix.type
+
+          conf3 = e('ROOT', '', {},
+            [e('appendix', '', {'type' => '2'}, [])],
+          )
+          # default value of <appendix> name </appendix> cannot be overwritten because it is finalized
+          ex3 = ConfigurableSpec::Example3.new.configure(conf2)
+          assert_equal 10, ex3.age
+          assert_equal '1', ex3.appendix.type
+          ex4 = ConfigurableSpec::Example4.new.configure(conf2)
+          assert_equal 20, ex4.age
+          assert_equal '1', ex4.appendix.type
+          # <appendix> age </appendix> can be added because it is missing in superclass spec
+          assert_equal 10, ex4.appendix.age
+        end
+      end
     end
 
     sub_test_case 'class defined with config_param/config_section having :alias' do

data/test/config/test_literal_parser.rb

@@ -228,6 +228,8 @@ module Fluent::Config
       test('"#{"}"}"') { assert_text_parsed_as("}", '"#{"}"}"') }
       test('"#{#}"') { assert_parse_error('"#{#}"') }  # error in embedded ruby code
       test("\"\#{\n=begin\n}\"") { assert_parse_error("\"\#{\n=begin\n}\"") }  # error in embedded ruby code
+      test('"#{v1}foo#{v2}"') { assert_text_parsed_as("#{v1}foo#{v2}", '"#{v1}foo#{v2}"') }
+      test('"#{1+1}foo#{2+2}bar"') { assert_text_parsed_as("#{1+1}foo#{2+2}bar", '"#{1+1}foo#{2+2}bar"') }
     end
 
     sub_test_case 'array parsing' do

data/test/plugin/test_in_tail.rb

@@ -388,6 +388,11 @@ class TailInputTest < Test::Unit::TestCase
       timeclass.should_receive(:now).with_no_args.and_return(Time.new(2010, 1, 2, 3, 4, 5))
       assert_equal EX_PATHS, plugin.expand_paths.sort
     end
+
+    # Test exclusion
+    exclude_config = EX_CONFIG + "  exclude_path [\"#{EX_PATHS.last}\"]"
+    plugin = create_driver(exclude_config, false).instance
+    assert_equal EX_PATHS - [EX_PATHS.last], plugin.expand_paths.sort
   end
 
   def test_refresh_watchers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.61
+  version: 0.10.62
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -103,6 +103,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,6 +113,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -230,16 +236,16 @@ dependencies:
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +253,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -254,6 +263,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -272,16 +284,16 @@ dependencies:
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -474,7 +486,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd event collector