fluentd 1.2.4.rc1 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14bc521f8482997b686c3c465c84dd7a3ef10ac52e208883c068394384163f66
-  data.tar.gz: aefedb8e2a5917a6bc37c56ed4d9c33e7ba76a0883d4a877e932cc681a610d82
+  metadata.gz: 17c2e18def2c549e14b7f5bd986553c3b2794047226b50ad396de592b94b292d
+  data.tar.gz: 305e459a87099290266c984d8c8c11634a0312cf17eae3fdd71456d586ef8f94
 SHA512:
-  metadata.gz: e767a398beb8858af702625ae9d900aac20eea0b8cf46efd126cd9281b1acb0a93bc66d5485fef0276d0ecf7e573ec092cad96d6f9146960a9ac6d5c79215604
-  data.tar.gz: dea6a30c9827ece7cb88801eebff7bd3425807e5d129400284d36f0059add10beb54390890e76c8b9de3eb9ec82aeab32322fd4aa41e36bb3487c333bee41a64
+  metadata.gz: e494dd2f456187adfbc860f89352c51b9b33532fd911e0c8a5eeb71859fe450bd42c62db29332daed2581e80ec9faa45d6b3f842d39606121886739cdb181b51
+  data.tar.gz: 98d885f434fb9c0534db4095e39869635477aed6c1236a219a41cb5b094e40e62f418f0cbab420dc7be6910e4cf0d7979601834fc2828bc149f29addd6f1b758

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # v1.2
 
+## Release v1.2.4 - 2018/08/01
+
+### Bug fixes
+
+* output: Consider timezone when calculate timekey
+  https://github.com/fluent/fluentd/pull/2054
+* output: Fix bug in suppress_emit_error_log_interval
+  https://github.com/fluent/fluentd/pull/2069
+* server-helper: Fix connection leak by close timing issue.
+  https://github.com/fluent/fluentd/pull/2087
+
 ## Release v1.2.3 - 2018/07/10
 
 ### Enhancements

data/lib/fluent/plugin_helper/server.rb

@@ -213,8 +213,10 @@ module Fluent
         socket_option_setter.call(sock)
         close_callback = ->(conn){ @_server_mutex.synchronize{ @_server_connections.delete(conn) } }
         server = Coolio::TCPServer.new(sock, nil, EventHandler::TCPServer, socket_option_setter, close_callback, @log, @under_plugin_development, block) do |conn|
-          @_server_mutex.synchronize do
-            @_server_connections << conn
+          unless conn.closing
+            @_server_mutex.synchronize do
+              @_server_connections << conn
+            end
           end
         end
         server.listen(backlog) if backlog
@@ -227,8 +229,10 @@ module Fluent
         socket_option_setter.call(sock)
         close_callback = ->(conn){ @_server_mutex.synchronize{ @_server_connections.delete(conn) } }
         server = Coolio::TCPServer.new(sock, nil, EventHandler::TLSServer, context, socket_option_setter, close_callback, @log, @under_plugin_development, block) do |conn|
-          @_server_mutex.synchronize do
-            @_server_connections << conn
+          unless conn.closing
+            @_server_mutex.synchronize do
+              @_server_connections << conn
+            end
           end
         end
         server.listen(backlog) if backlog
@@ -538,6 +542,8 @@ module Fluent
         end
 
         class TCPServer < Coolio::TCPSocket
+          attr_reader :closing
+
           def initialize(sock, socket_option_setter, close_callback, log, under_plugin_development, connect_callback)
             raise ArgumentError, "socket must be a TCPSocket: sock=#{sock}" unless sock.is_a?(TCPSocket)
 
@@ -594,7 +600,7 @@ module Fluent
           rescue => e
             @log.error "unexpected error on reading data", host: @callback_connection.remote_host, port: @callback_connection.remote_port, error: e
             @log.error_backtrace
-            close(true) rescue nil
+            close rescue nil
             raise if @under_plugin_development
           end
 
@@ -603,7 +609,7 @@ module Fluent
           rescue => e
             @log.error "unexpected error on reading data", host: @callback_connection.remote_host, port: @callback_connection.remote_port, error: e
             @log.error_backtrace
-            close(true) rescue nil
+            close rescue nil
             raise if @under_plugin_development
           end
 
@@ -618,6 +624,8 @@ module Fluent
         end
 
         class TLSServer < Coolio::Socket
+          attr_reader :closing
+
           # It can't use Coolio::TCPSocket, because Coolio::TCPSocket checks that underlying socket (1st argument of super) is TCPSocket.
           def initialize(sock, context, socket_option_setter, close_callback, log, under_plugin_development, connect_callback)
             raise ArgumentError, "socket must be a TCPSocket: sock=#{sock}" unless sock.is_a?(TCPSocket)
@@ -748,7 +756,7 @@ module Fluent
           rescue => e
             @log.error "unexpected error on reading data", host: @callback_connection.remote_host, port: @callback_connection.remote_port, error: e
             @log.error_backtrace
-            close(true) rescue nil
+            close rescue nil
             raise if @under_plugin_development
           end
 
@@ -757,7 +765,7 @@ module Fluent
           rescue => e
             @log.error "unexpected error on reading data", host: @callback_connection.remote_host, port: @callback_connection.remote_port, error: e
             @log.error_backtrace
-            close(true) rescue nil
+            close rescue nil
             raise if @under_plugin_development
           end
 

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.2.4.rc1'
+  VERSION = '1.2.4'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.2.4.rc1
+  version: 1.2.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -764,9 +764,9 @@ 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.7.6