fluentd 0.12.25 → 0.12.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3a1a70a3ede3a8713d613dba499b4224ae138d1
-  data.tar.gz: 4177832b3d06ba52df8032bd5457d7bffaaccf76
+  metadata.gz: 8ecb5a38a503480766ad28bd9c90d8e650e857a7
+  data.tar.gz: 9e033240aed3098e153ccf552987a72acfa2ab0b
 SHA512:
-  metadata.gz: 30e12945ba3a228f68ad2f8052eb4e0fab9bc6e9a21df25a7bd33c397d806c3d0ad6e04897f107935838544dd9d4fc32286b7cbeb9fb8f82b3f3e5a90c940a0e
-  data.tar.gz: 8e4f32b8e1ab4aa053b1b147d6b6eb19f20d9c7d0f427404b0201008034c0bb2057c1de52a33868276e9014dd592960ad0068b6470553d7ef756f93d6a589c14
+  metadata.gz: 71605065f90941ffc682fe7811f19fe88e2899e312fdf7e0633fb3b552e00e53fc8ba68f41114ce2ca885fae825d457d86b48c0266093f55699a1571d280a4d2
+  data.tar.gz: c9f4609a941738a2bf2e99a9a123c074a0444c6aa9b8fdc6584e9a9d50492d47b98ad0c57e96e5440a3f94f42cac19f39ba8242604863dbf51d8454e7f588e7c

data/ChangeLog

@@ -1,5 +1,11 @@
 # v0.12
 
+## Release 0.12.26 - 2016/05/30
+
+### Bug fixes
+
+* Fix regression of not require sigdump
+
 ## Release 0.12.25 - 2016/05/25
 
 ### New features / Enhancement

data/lib/fluent/supervisor.rb

@@ -17,6 +17,12 @@
 require 'etc'
 require 'fcntl'
 
+begin
+  require 'sigdump/setup'
+rescue Exception
+  # ignore LoadError and others (related with signals): it may raise these errors in Windows
+end
+
 require 'fluent/config'
 require 'fluent/env'
 require 'fluent/engine'

data/lib/fluent/test/output_test.rb

@@ -76,20 +76,24 @@ module Fluent
       def run(num_waits = 10, &block)
         result = nil
         super(num_waits) {
+          block.call if block
+
           es = ArrayEventStream.new(@entries)
           buffer = @instance.format_stream(@tag, es)
 
-          block.call if block
-
           if @expected_buffer
             assert_equal(@expected_buffer, buffer)
           end
 
-          key = ''
-          if @instance.respond_to?(:time_slicer)
+          case
+          when @instance.is_a?(Fluent::ObjectBufferedOutput)
+            key = @tag
+          when @instance.respond_to?(:time_slicer)
             # this block is only for test_out_file
-            time, record = @entries.first
+            time, _record = @entries.first
             key = @instance.time_slicer.call(time)
+          else
+            key = ''
           end
           chunk = @instance.buffer.new_chunk(key)
           chunk << buffer
@@ -128,6 +132,8 @@ module Fluent
       def run(&block)
         result = []
         super {
+          block.call if block
+
           buffer = ''
           @entries.keys.each {|key|
             es = ArrayEventStream.new(@entries[key])
@@ -135,8 +141,6 @@ module Fluent
             buffer << @instance.format_stream(@tag, es)
           }
 
-          block.call if block
-
           if @expected_buffer
             assert_equal(@expected_buffer, buffer)
           end

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.25'
+  VERSION = '0.12.26'
 
 end

data/test/plugin/test_out_forward.rb

@@ -23,7 +23,7 @@ class ForwardOutputTest < Test::Unit::TestCase
   ]
 
   def create_driver(conf=CONFIG)
-    Fluent::Test::OutputTestDriver.new(Fluent::ForwardOutput) {
+    Fluent::Test::BufferedOutputTestDriver.new(Fluent::ForwardOutput) {
       attr_reader :responses, :exceptions
 
       def initialize
@@ -39,6 +39,13 @@ class ForwardOutputTest < Test::Unit::TestCase
         @exceptions << e
         raise e
       end
+
+      # Fluentd v0.12 BufferedOutputTestDriver calls this method.
+      # BufferedOutput#format_stream calls format method, but ForwardOutput#format is not defined.
+      # Because ObjectBufferedOutput#emit calls es.to_msgpack_stream directly.
+      def format_stream(tag, es)
+        es.to_msgpack_stream
+      end
     }.configure(conf)
   end
 
@@ -231,10 +238,12 @@ class ForwardOutputTest < Test::Unit::TestCase
     end
     d.run_timeout = 2
 
-    target_input_driver.run do
-      d.run do
-        records.each do |record|
-          d.emit record, time
+    assert_raise Fluent::ForwardOutputACKTimeoutError do
+      target_input_driver.run do
+        d.run do
+          records.each do |record|
+            d.emit record, time
+          end
         end
       end
     end
@@ -272,10 +281,12 @@ class ForwardOutputTest < Test::Unit::TestCase
     end
     d.run_timeout = 2
 
-    target_input_driver.run do
-      d.run do
-        records.each do |record|
-          d.emit record, time
+    assert_raise Fluent::ForwardOutputConnectionClosedError do
+      target_input_driver.run do
+        d.run do
+          records.each do |record|
+            d.emit record, time
+          end
         end
       end
     end
@@ -318,7 +329,10 @@ class ForwardOutputTest < Test::Unit::TestCase
         end
 
         def close
-          @sock.close
+          unless @sock.closed?
+            @sock.close_write
+            @sock.close
+          end
         end
       }
 
@@ -332,6 +346,7 @@ class ForwardOutputTest < Test::Unit::TestCase
                 handler.on_read(raw_data)
                 # chunk_counter is reset to zero only after all the data have been received and successfully deserialized.
                 break if handler.chunk_counter == 0
+                break if sock.closed?
               end
               if disconnect
                 handler.close
@@ -339,7 +354,10 @@ class ForwardOutputTest < Test::Unit::TestCase
               end
               sleep  # wait for connection to be closed by client
             ensure
-              sock.close if sock
+              if sock && !sock.closed?
+                sock.close_write
+                sock.close
+              end
             end
           end
         end
@@ -370,10 +388,6 @@ class ForwardOutputTest < Test::Unit::TestCase
     def initialize(klass, &block)
       super(klass, &block)
       @engine = DummyEngineClass.new
-      @klass = klass
-      # To avoid accessing Fluent::Engine, set Engine as a plugin's class constant (Fluent::SomePlugin::Engine).
-      # But this makes it impossible to run tests concurrently by threading in a process.
-      @klass.const_set(:Engine, @engine)
     end
 
     def inject_router
@@ -383,9 +397,6 @@ class ForwardOutputTest < Test::Unit::TestCase
 
     def run(&block)
       super(&block)
-      @klass.class_eval do
-        remove_const(:Engine)
-      end
     end
 
     def emits

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.25
+  version: 0.12.26
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack