Always log message type and operation name

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