From 8052c391bfeaab6a7a2b51cfe6d528e60275bc6d Mon Sep 17 00:00:00 2001
From: Rodrigo Verdiani <rocverdiani@gmail.com>
Date: Sat, 28 Mar 2026 19:57:53 -0300
Subject: [PATCH] refactor: enhance session cleanup task with error handling
 and logging

---
 .../task/FlareSessionCleanupTask.java         | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/magamochi/ingestion/task/FlareSessionCleanupTask.java b/src/main/java/com/magamochi/ingestion/task/FlareSessionCleanupTask.java
index 26610c5..8bb46db 100644
--- a/src/main/java/com/magamochi/ingestion/task/FlareSessionCleanupTask.java
+++ b/src/main/java/com/magamochi/ingestion/task/FlareSessionCleanupTask.java
@@ -1,13 +1,16 @@
 package com.magamochi.ingestion.task;
 
 import com.magamochi.ingestion.client.FlareClient;
+import com.magamochi.ingestion.model.entity.FlareSession;
 import com.magamochi.ingestion.service.FlareSessionRegistry;
 import java.time.Duration;
 import java.time.Instant;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+@Log4j2
 @Component
 @RequiredArgsConstructor
 public class FlareSessionCleanupTask {
@@ -18,18 +21,21 @@ public class FlareSessionCleanupTask {
 
   @Scheduled(fixedDelayString = "1m")
   public void cleanExpiredSessions() {
-    registry
-        .getSessions()
-        .forEach(
-            (provider, session) -> {
-              if (Duration.between(session.lastAccess(), Instant.now()).compareTo(TIMEOUT) <= 0) {
-                return;
-              }
+    registry.getSessions().forEach(this::destroySession);
+  }
 
-              client.destroySession(
-                  FlareClient.SessionDestroyRequest.builder().session(session.sessionId()).build());
+  public void destroySession(String provider, FlareSession session) {
+    if (Duration.between(session.lastAccess(), Instant.now()).compareTo(TIMEOUT) <= 0) {
+      return;
+    }
 
-              registry.remove(provider);
-            });
+    try {
+      client.destroySession(
+          FlareClient.SessionDestroyRequest.builder().session(session.sessionId()).build());
+    } catch (Exception e) {
+      log.warn("Failed to destroy session for provider {}: {}", provider, e.getMessage());
+    }
+
+    registry.remove(provider);
   }
 }