out_forward: Fix to update timeout of cached sockets

In `SocketCache`, timeout of sockets are set only on creating them and never be updated. So that cached sockets (`@available_sockets`) are always closed after `keepalive_timeout` is passed from its creation, even if it was used within `keepalive_timeout` seconds. Signed-off-by: Takuro Ashie <[email protected]>
fluent · Apr 11, 2022 · 527e7db · 527e7db
1 parent b04e808
commit 527e7db
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/lib/fluent/plugin/out_forward/socket_cache.rb b/lib/fluent/plugin/out_forward/socket_cache.rb
@@ -50,6 +50,7 @@ def checkout_or(key)
       def checkin(sock)
         @mutex.synchronize do
           if (s = @inflight_sockets.delete(sock))
+            s.timeout = timeout
             @available_sockets[s.key] << s
           else
             @log.debug("there is no socket #{sock}")
@@ -122,6 +123,7 @@ def pick_socket(key)
         t = Time.now
         if (s = @available_sockets[key].find { |sock| !expired_socket?(sock, time: t) })
           @inflight_sockets[s.sock] = @available_sockets[key].delete(s)
+          s.timeout = timeout
           s
         else
           nil