temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-07 21:04:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix usage of deprecated functions (#1192)

Browse Source 
* Fix usage of deprecated functions

* lint

* Lint

* Another
This commit is contained in:
Mitchell Syer
2024-12-07 23:56:42 -05:00
committed by GitHub
parent 1d541a30ae
commit 2e3af25dd4
10 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt
View File

@@ -97,7 +97,7 @@ class ApolloSubscriptionProtocolHandler(
try {
objectMapper.readValue(payload)
} catch (exception: Exception) {
logger.error("Error parsing the subscription message", exception)
logger.error(exception) { "Error parsing the subscription message" }
null
}
@@ -106,13 +106,13 @@ class ApolloSubscriptionProtocolHandler(
context: WsContext,
): Flow<SubscriptionOperationMessage> {
if (operationMessage.id == null) {
logger.error("GraphQL subscription operation id is required")
logger.error { "GraphQL subscription operation id is required" }
return flowOf(basicConnectionErrorMessage)
}
if (sessionState.doesOperationExist(operationMessage)) {
sessionState.terminateSession(context, CloseStatus(4409, "Subscriber for ${operationMessage.id} already exists"))
logger.info("Already subscribed to operation ${operationMessage.id} for session ${context.sessionId()}")
logger.info { "Already subscribed to operation ${operationMessage.id} for session ${context.sessionId()}" }
return emptyFlow()
}
@@ -120,7 +120,7 @@ class ApolloSubscriptionProtocolHandler(
val payload = operationMessage.payload
if (payload == null) {
logger.error("GraphQL subscription payload was null instead of a GraphQLRequest object")
logger.error { "GraphQL subscription payload was null instead of a GraphQLRequest object" }
return flowOf(SubscriptionOperationMessage(type = GQL_ERROR.type, id = operationMessage.id))
}
@@ -137,7 +137,7 @@ class ApolloSubscriptionProtocolHandler(
}.onCompletion { if (it == null) emitAll(onComplete(operationMessage)) }
.onStart { sessionState.saveOperation(context, operationMessage, currentCoroutineContext().job) }
} catch (exception: Exception) {
logger.error("Error running graphql subscription", exception)
logger.error(exception) { "Error running graphql subscription" }
// Do not terminate the session, just stop the operation messages
sessionState.completeOperation(operationMessage)
return flowOf(SubscriptionOperationMessage(type = GQL_ERROR.type, id = operationMessage.id))
@@ -168,19 +168,19 @@ class ApolloSubscriptionProtocolHandler(
private fun onPing(): Flow<SubscriptionOperationMessage> = flowOf(pongMessage)
private fun onDisconnect(context: WsContext): Flow<SubscriptionOperationMessage> {
logger.debug("Session \"${context.sessionId()}\" disconnected")
logger.debug { "Session \"${context.sessionId()}\" disconnected" }
sessionState.terminateSession(context, CloseStatus(1000, "Normal Closure"))
return emptyFlow()
}
private fun onUnknownOperation(operationMessage: SubscriptionOperationMessage): Flow<SubscriptionOperationMessage> {
logger.error("Unknown subscription operation $operationMessage")
logger.error { "Unknown subscription operation $operationMessage" }
sessionState.completeOperation(operationMessage)
return emptyFlow()
}
private fun onException(exception: Exception): Flow<SubscriptionOperationMessage> {
logger.error("Error parsing the subscription message", exception)
logger.error(exception) { "Error parsing the subscription message" }
return flowOf(basicConnectionErrorMessage)
}
}