cid-3919: Modify retry mechanism (#125)

Author: henriq-amaral-leanix

src/main/kotlin/net/leanix/githubagent/handler/BrokerStompSessionHandler.kt

@@ -42,10 +42,12 @@ class BrokerStompSessionHandler(
 
     override fun handleTransportError(session: StompSession, exception: Throwable) {
         logger.error("Connection error: ${exception.message}")
-        isConnected = false
-        logger.error("Session closed. This could be due to a network error or the server closing the connection.")
-        logger.info("Reconnecting...")
-        webSocketService.initSession()
+        if (isConnected) {
+            isConnected = false
+            logger.error("Session closed. This could be due to a network error or the server closing the connection.")
+            logger.info("Reconnecting...")
+            webSocketService.initSession()
+        }
     }
 
     fun isConnected(): Boolean {

src/main/kotlin/net/leanix/githubagent/scheduler/AgentConnectionScheduler.kt

@@ -0,0 +1,25 @@
+package net.leanix.githubagent.scheduler
+
+import net.leanix.githubagent.handler.BrokerStompSessionHandler
+import net.leanix.githubagent.services.WebSocketService
+import org.slf4j.LoggerFactory
+import org.springframework.scheduling.annotation.Scheduled
+import org.springframework.stereotype.Component
+
+@Component
+class AgentConnectionScheduler(
+    private val brokerStompSessionHandler: BrokerStompSessionHandler,
+    private val webSocketService: WebSocketService
+) {
+
+    private val logger = LoggerFactory.getLogger(AgentConnectionScheduler::class.java)
+
+    @Scheduled(fixedDelay = 600000, initialDelay = 600000)
+    fun checkConnection() {
+        logger.info("Checking agent connection")
+        if (!brokerStompSessionHandler.isConnected()) {
+            logger.info("Trying to connect to ws server")
+            webSocketService.initSession()
+        }
+    }
+}

src/main/kotlin/net/leanix/githubagent/services/GitHubWebhookService.kt

@@ -23,7 +23,7 @@ class GitHubWebhookService(
     fun handleWebhookEvent(eventType: String, host: String, signature256: String?, payload: String) {
         val runId = cachingService.get("runId")
         if (runId != null && eventType.uppercase() != "INSTALLATION") {
-            logger.info("Received a webhook event while a full sync is in progress, ignoring the event.")
+            logger.debug("Received a webhook event while a full sync is in progress, ignoring the event.")
             return
         }
         if (SUPPORTED_EVENT_TYPES.contains(eventType.uppercase())) {

src/test/kotlin/net/leanix/githubagent/scheduler/AgentConnectionSchedulerTest.kt

@@ -0,0 +1,37 @@
+package net.leanix.githubagent.scheduler
+
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.verify
+import net.leanix.githubagent.handler.BrokerStompSessionHandler
+import net.leanix.githubagent.services.WebSocketService
+import org.junit.jupiter.api.Test
+
+class AgentConnectionSchedulerTest {
+
+    private var brokerStompSessionHandler: BrokerStompSessionHandler = mockk()
+    private var webSocketService: WebSocketService = mockk()
+    private var scheduler: AgentConnectionScheduler =
+        AgentConnectionScheduler(brokerStompSessionHandler, webSocketService)
+
+    @Test
+    fun `should not connect when already connected`() {
+        every { brokerStompSessionHandler.isConnected() } returns true
+
+        scheduler.checkConnection()
+
+        verify(exactly = 0) { webSocketService.initSession() }
+    }
+
+    @Test
+    fun `should connect when not connected`() {
+        every { brokerStompSessionHandler.isConnected() } returns false
+        every { webSocketService.initSession() } just Runs
+
+        scheduler.checkConnection()
+
+        verify(exactly = 1) { webSocketService.initSession() }
+    }
+}