fluentd 0.14.9 → 0.14.10

data/test/test_event_time.rb

@@ -51,7 +51,9 @@ class EventTimeTest < Test::Unit::TestCase
 
   test 'Oj.dump' do
     time = Fluent::EventTime.new(100)
-    assert_equal('{"time":100}', Oj.dump({'time' => time}, mode: :compat))
+    require 'fluent/env'
+    Oj.default_options = Fluent::DEFAULT_OJ_OPTIONS
+    assert_equal('{"time":100}', Oj.dump({'time' => time}))
     assert_equal('["tag",100,{"key":"value"}]', Oj.dump(["tag", time, {"key" => "value"}], mode: :compat))
   end
 

data/test/test_output.rb

@@ -188,8 +188,16 @@ module FluentOutputTest
         @written_chunk_keys = []
         @errors_in_write = []
       end
+
+      def configure(conf)
+        super
+
+        @formatter = Fluent::Plugin.new_formatter('out_file')
+        @formatter.configure(conf)
+      end
+
       def format(tag, time, record)
-        [tag, time, record].to_json + "\n"
+        @formatter.format(tag, time, record)
       end
       def write(chunk)
         @written_chunk_keys << chunk.key
@@ -203,6 +211,16 @@ module FluentOutputTest
       Fluent::Test::TimeSlicedOutputTestDriver.new(TimeSlicedOutputTestPlugin).configure(conf, true)
     end
 
+    data(:none => '',
+         :utc => "utc",
+         :localtime => 'localtime',
+         :timezone => 'timezone +0000')
+    test 'configure with timezone related parameters' do |param|
+      assert_nothing_raised {
+        create_driver(CONFIG + param)
+      }
+    end
+
     sub_test_case "test emit" do
       setup do
         @time = Time.parse("2011-01-02 13:14:15 UTC")
@@ -231,6 +249,17 @@ module FluentOutputTest
         assert_equal [], d.instance.errors_in_write
         assert_equal ["2016110808"], d.instance.written_chunk_keys # default timezone is UTC
       end
+
+      test "check formatted time compatibility with utc. Should Z, not +00:00" do
+        d = create_driver(CONFIG + %[
+          utc
+          include_time_key
+        ])
+        time = Time.parse("2016-11-08 12:00:00 UTC").to_i
+        d.emit({"a" => 1}, time)
+        d.expect_format %[2016-11-08T12:00:00Z\ttest\t{"a":1,"time":"2016-11-08T12:00:00Z"}\n]
+        d.run
+      end
     end
   end
 end

data/test/test_test_drivers.rb

@@ -100,7 +100,10 @@ class TestDriverTest < ::Test::Unit::TestCase
 
   sub_test_case 'output plugin test driver' do
     test 'returns the block value as the return value of #run' do
-      d = Fluent::Test::Driver::Output.new(Class.new(Fluent::Plugin::Output)) do
+      d = Fluent::Test::Driver::Output.new(Fluent::Plugin::Output) do
+        def prefer_buffered_processing
+          false
+        end
         def process(tag, es)
           # drop
         end
@@ -116,7 +119,7 @@ class TestDriverTest < ::Test::Unit::TestCase
 
   sub_test_case 'filter plugin test driver' do
     test 'returns the block value as the return value of #run' do
-      d = Fluent::Test::Driver::Filter.new(Class.new(Fluent::Plugin::Filter)) do
+      d = Fluent::Test::Driver::Filter.new(Fluent::Plugin::Filter) do
         def filter(tag, time, record)
           record
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.14.9
+  version: 0.14.10
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -62,16 +62,22 @@ dependencies:
   name: serverengine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +310,7 @@ files:
 - bin/fluent-debug
 - bin/fluent-gem
 - bin/fluentd
+- code-of-conduct.md
 - example/copy_roundrobin.conf
 - example/filter_stdout.conf
 - example/in_dummy_with_compression.conf
@@ -472,6 +479,9 @@ files:
 - lib/fluent/plugin_helper/inject.rb
 - lib/fluent/plugin_helper/parser.rb
 - lib/fluent/plugin_helper/retry_state.rb
+- lib/fluent/plugin_helper/server.rb
+- lib/fluent/plugin_helper/socket.rb
+- lib/fluent/plugin_helper/socket_option.rb
 - lib/fluent/plugin_helper/storage.rb
 - lib/fluent/plugin_helper/thread.rb
 - lib/fluent/plugin_helper/timer.rb
@@ -608,6 +618,7 @@ files:
 - test/plugin_helper/test_inject.rb
 - test/plugin_helper/test_parser.rb
 - test/plugin_helper/test_retry_state.rb
+- test/plugin_helper/test_server.rb
 - test/plugin_helper/test_storage.rb
 - test/plugin_helper/test_thread.rb
 - test/plugin_helper/test_timer.rb
@@ -764,6 +775,7 @@ test_files:
 - test/plugin_helper/test_inject.rb
 - test/plugin_helper/test_parser.rb
 - test/plugin_helper/test_retry_state.rb
+- test/plugin_helper/test_server.rb
 - test/plugin_helper/test_storage.rb
 - test/plugin_helper/test_thread.rb
 - test/plugin_helper/test_timer.rb
@@ -795,3 +807,4 @@ test_files:
 - test/test_time_formatter.rb
 - test/test_time_parser.rb
 - test/test_unique_id.rb
+has_rdoc: false