fluentd 1.2.0.pre1 → 1.2.0

data/test/plugin_helper/test_retry_state.rb

@@ -419,4 +419,24 @@ class RetryStateHelperTest < Test::Unit::TestCase
     assert_equal (dummy_current_time + 100), s.timeout_at
     assert_equal (dummy_current_time + timeout * 0.8), s.secondary_transition_at
   end
+
+  sub_test_case 'exponential backoff' do
+    test 'too big steps(check inf handling)' do
+      s = @d.retry_state_create(:t11, :exponential_backoff, 0.1, 300, randomize: false, forever: true, backoff_base: 2)
+      dummy_current_time = s.start
+      override_current_time(s, dummy_current_time)
+
+      i = 1
+      while i < 1027
+        if i >= 1025
+          # With this setting, 1025+ number causes inf in `calc_interval`, so 1024 value is used for next_time
+          assert_nothing_raised(FloatDomainError) { s.step }
+          assert_equal (dummy_current_time + 0.1 * (2 ** (1024 - 1))), s.next_time
+        else
+          s.step
+        end
+        i += 1
+      end
+    end
+  end
 end

data/test/test_supervisor.rb

@@ -134,6 +134,17 @@ class SupervisorTest < ::Test::Unit::TestCase
     format json
     time_format %Y
   </log>
+  <counter_server>
+    bind 127.0.0.1
+    port 24321
+    scope server1
+    backup_path /tmp/backup
+  </counter_server>
+  <counter_client>
+    host 127.0.0.1
+    port 24321
+    timeout 2
+  </counter_client>
 </system>
     EOC
     conf = Fluent::Config.parse(conf_data, "(test)", "(test_dir)", true)
@@ -151,6 +162,15 @@ class SupervisorTest < ::Test::Unit::TestCase
     assert_equal TMP_ROOT_DIR, sys_conf.root_dir
     assert_equal :json, sys_conf.log.format
     assert_equal '%Y', sys_conf.log.time_format
+    counter_server = sys_conf.counter_server
+    assert_equal '127.0.0.1', counter_server.bind
+    assert_equal 24321, counter_server.port
+    assert_equal 'server1', counter_server.scope
+    assert_equal '/tmp/backup', counter_server.backup_path
+    counter_client = sys_conf.counter_client
+    assert_equal '127.0.0.1', counter_client.host
+    assert_equal 24321, counter_client.port
+    assert_equal 2, counter_client.timeout
   end
 
   def test_main_process_signal_handlers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre1
+  version: 1.2.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -347,6 +347,7 @@ files:
 - bin/fluentd
 - code-of-conduct.md
 - example/copy_roundrobin.conf
+- example/counter.conf
 - example/filter_stdout.conf
 - example/in_dummy_blocks.conf
 - example/in_dummy_with_compression.conf
@@ -426,6 +427,14 @@ files:
 - lib/fluent/config/types.rb
 - lib/fluent/config/v1_parser.rb
 - lib/fluent/configurable.rb
+- lib/fluent/counter.rb
+- lib/fluent/counter/base_socket.rb
+- lib/fluent/counter/client.rb
+- lib/fluent/counter/error.rb
+- lib/fluent/counter/mutex_hash.rb
+- lib/fluent/counter/server.rb
+- lib/fluent/counter/store.rb
+- lib/fluent/counter/validator.rb
 - lib/fluent/daemon.rb
 - lib/fluent/engine.rb
 - lib/fluent/env.rb
@@ -522,6 +531,7 @@ files:
 - lib/fluent/plugin_helper/cert_option.rb
 - lib/fluent/plugin_helper/child_process.rb
 - lib/fluent/plugin_helper/compat_parameters.rb
+- lib/fluent/plugin_helper/counter.rb
 - lib/fluent/plugin_helper/event_emitter.rb
 - lib/fluent/plugin_helper/event_loop.rb
 - lib/fluent/plugin_helper/extract.rb
@@ -605,6 +615,12 @@ files:
 - test/config/test_section.rb
 - test/config/test_system_config.rb
 - test/config/test_types.rb
+- test/counter/test_client.rb
+- test/counter/test_error.rb
+- test/counter/test_mutex_hash.rb
+- test/counter/test_server.rb
+- test/counter/test_store.rb
+- test/counter/test_validator.rb
 - test/helper.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
@@ -665,6 +681,7 @@ files:
 - test/plugin/test_out_stream.rb
 - test/plugin/test_output.rb
 - test/plugin/test_output_as_buffered.rb
+- test/plugin/test_output_as_buffered_backup.rb
 - test/plugin/test_output_as_buffered_compress.rb
 - test/plugin/test_output_as_buffered_overflow.rb
 - test/plugin/test_output_as_buffered_retries.rb
@@ -747,12 +764,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Fluentd event collector
@@ -775,6 +792,12 @@ test_files:
 - test/config/test_section.rb
 - test/config/test_system_config.rb
 - test/config/test_types.rb
+- test/counter/test_client.rb
+- test/counter/test_error.rb
+- test/counter/test_mutex_hash.rb
+- test/counter/test_server.rb
+- test/counter/test_store.rb
+- test/counter/test_validator.rb
 - test/helper.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
@@ -835,6 +858,7 @@ test_files:
 - test/plugin/test_out_stream.rb
 - test/plugin/test_output.rb
 - test/plugin/test_output_as_buffered.rb
+- test/plugin/test_output_as_buffered_backup.rb
 - test/plugin/test_output_as_buffered_compress.rb
 - test/plugin/test_output_as_buffered_overflow.rb
 - test/plugin/test_output_as_buffered_retries.rb