Always log message type and operation name

Suwayomi · Oct 4, 2023 · 70075ba · 70075ba
1 parent 5efd271
commit 70075ba
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/...tlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt b/...tlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt
@@ -53,15 +53,26 @@ class ApolloSubscriptionProtocolHandler(
     private val basicConnectionErrorMessage = SubscriptionOperationMessage(type = GQL_ERROR.type)
     private val acknowledgeMessage = SubscriptionOperationMessage(GQL_CONNECTION_ACK.type)
 
+    private fun getOperationName(payload: Any?): String {
+        try {
+            @Suppress("UNCHECKED_CAST")
+            return (payload as Map<String, String>)["operationName"]!!
+        } catch (e: Exception) {
+            return "__UNKNOWN__"
+        }
+    }
+
     fun handleMessage(context: WsMessageContext): Flow<SubscriptionOperationMessage> {
         val operationMessage = convertToMessageOrNull(context.message()) ?: return flowOf(basicConnectionErrorMessage)
         logger.debug {
-            "GraphQL subscription client message, sessionId=${context.sessionId} ${
-            if (serverConfig.gqlDebugLogsEnabled.value) {
-                "operationMessage=$operationMessage"
-            } else {
-                ""
-            }
+            "GraphQL subscription client message, sessionId=${context.sessionId} type=${operationMessage.type} operationName=${
+                getOperationName(operationMessage.payload)
+            } ${
+                if (serverConfig.gqlDebugLogsEnabled.value) {
+                    "operationMessage=$operationMessage"
+                } else {
+                    ""
+                }
             }"
         }