output: Unify logging retry error

Signed-off-by: Takuro Ashie <[email protected]>
fluent · Mar 25, 2022 · a4f15f9 · a4f15f9
1 parent e3f5034
commit a4f15f9
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/lib/fluent/plugin/output.rb b/lib/fluent/plugin/output.rb
@@ -1278,11 +1278,8 @@ def update_retry_state(chunk_id, using_secondary, error = nil)
 
             if @retry.limit?
               handle_limit_reached(error)
-            else
-              if error
-                log.warn "failed to flush the buffer.", retry_times: @retry.steps, next_retry_time: @retry.next_time.round, chunk: chunk_id_hex, error: error
-                log.warn_backtrace error.backtrace
-              end
+            elsif error
+              log_retry_error(error, chunk_id_hex, using_secondary)
             end
 
             return
@@ -1300,22 +1297,23 @@ def update_retry_state(chunk_id, using_secondary, error = nil)
 
           if @retry.limit?
             handle_limit_reached(error)
-          else
-            if error
-              if using_secondary
-                msg = "failed to flush the buffer with secondary output."
-                log.warn msg, retry_times: @retry.steps, next_retry_time: @retry.next_time.round, chunk: chunk_id_hex, error: error
-                log.warn_backtrace error.backtrace
-              else
-                msg = "failed to flush the buffer."
-                log.warn msg, retry_times: @retry.steps, next_retry_time: @retry.next_time.round, chunk: chunk_id_hex, error: error
-                log.warn_backtrace error.backtrace
-              end
-            end
+          elsif error
+            log_retry_error(error, chunk_id_hex, using_secondary)
           end
         end
       end
 
+      def log_retry_error(error, chunk_id_hex, using_secondary)
+        return unless error
+        if using_secondary
+          msg = "failed to flush the buffer with secondary output."
+        else
+          msg = "failed to flush the buffer."
+        end
+        log.warn(msg, retry_times: @retry.steps, next_retry_time: @retry.next_time.round, chunk: chunk_id_hex, error: error)
+        log.warn_backtrace(error.backtrace)
+      end
+
       def handle_limit_reached(error)
         if error
           records = @buffer.queued_records