DEV2-4011 Retry get server url (#661)

* log error in warn level - to avoid prompting the user * retry get server url in case of failure
codota · Oct 16, 2023 · fe14b31 · fe14b31
1 parent 30ebe77
commit fe14b31
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Common/src/main/java/com/tabnineCommon/chat/ChatMessagesRouter.kt b/Common/src/main/java/com/tabnineCommon/chat/ChatMessagesRouter.kt
@@ -54,7 +54,7 @@ object ChatMessagesRouter {
 
             return ChatMessageResponse(request.id, responsePayload)
         } catch (e: Exception) {
-            Logger.getInstance(ChatMessagesRouter::class.java).error("Failed to handle request '${request.command}'", e)
+            Logger.getInstance(ChatMessagesRouter::class.java).warn("Failed to handle request '${request.command}'", e)
             return ChatMessageResponse(request.id, error = e.message ?: e.toString())
         }
     }

diff --git a/Common/src/main/java/com/tabnineCommon/chat/commandHandlers/GetServerUrlHandler.kt b/Common/src/main/java/com/tabnineCommon/chat/commandHandlers/GetServerUrlHandler.kt
@@ -16,7 +16,19 @@ data class ServerUrlResponse(val serverUrl: String)
 class GetServerUrlHandler(gson: Gson) : ChatMessageHandler<ServerUrlRequest, ServerUrlResponse>(gson) {
     override fun handle(payload: ServerUrlRequest?, project: Project): ServerUrlResponse {
         if (CapabilitiesService.getInstance().isCapabilityEnabled(Capability.CHAT_URL_FROM_BINARY) && payload != null) {
-            val response = DependencyContainer.instanceOfBinaryRequestFacade().executeRequest(ChatCommunicatorAddressRequest(payload.kind))
+            val request = ChatCommunicatorAddressRequest(payload.kind)
+            var response = DependencyContainer.instanceOfBinaryRequestFacade().executeRequest(
+                request
+            )
+
+            // retry if failed
+            // might happen if binary just restarted
+            if (response == null) {
+                response = DependencyContainer.instanceOfBinaryRequestFacade().executeRequest(
+                    request
+                )
+            }
+
             return ServerUrlResponse(response.address)
         }