diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SettingsMutation.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SettingsMutation.kt index 8154d93e..503c0f94 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SettingsMutation.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SettingsMutation.kt @@ -156,7 +156,6 @@ class SettingsMutation { // misc updateSetting(settings.debugLogsEnabled, serverConfig.debugLogsEnabled) - updateSetting(settings.gqlDebugLogsEnabled, serverConfig.gqlDebugLogsEnabled) updateSetting(settings.systemTrayEnabled, serverConfig.systemTrayEnabled) updateSetting(settings.maxLogFiles, serverConfig.maxLogFiles) updateSetting(settings.maxLogFileSize, serverConfig.maxLogFileSize) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt index c63dc19c..8610fa3d 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt @@ -35,7 +35,6 @@ import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMess import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ServerMessages.GQL_ERROR import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ServerMessages.GQL_NEXT import suwayomi.tachidesk.graphql.server.toGraphQLContext -import suwayomi.tachidesk.server.serverConfig /** * Implementation of the `graphql-transport-ws` protocol defined by Denis Badurina @@ -71,12 +70,6 @@ class ApolloSubscriptionProtocolHandler( logger.debug { "GraphQL subscription client message, sessionId=${context.sessionId()} type=${operationMessage.type} operationName=${ getOperationName(operationMessage.payload) - } ${ - if (serverConfig.gqlDebugLogsEnabled.value) { - "operationMessage=$operationMessage" - } else { - "" - } }" } } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SettingsType.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SettingsType.kt index 5953c6f2..fa58aac5 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SettingsType.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SettingsType.kt @@ -71,6 +71,8 @@ interface Settings : Node { // misc val debugLogsEnabled: Boolean? + + @GraphQLDeprecated("Removed - does not do anything") val gqlDebugLogsEnabled: Boolean? val systemTrayEnabled: Boolean? val maxLogFiles: Int? @@ -140,6 +142,7 @@ data class PartialSettingsType( override val basicAuthPassword: String?, // misc override val debugLogsEnabled: Boolean?, + @GraphQLDeprecated("Removed - does not do anything") override val gqlDebugLogsEnabled: Boolean?, override val systemTrayEnabled: Boolean?, override val maxLogFiles: Int?, @@ -206,6 +209,7 @@ class SettingsType( override val basicAuthPassword: String, // misc override val debugLogsEnabled: Boolean, + @GraphQLDeprecated("Removed - does not do anything") override val gqlDebugLogsEnabled: Boolean, override val systemTrayEnabled: Boolean, override val maxLogFiles: Int, @@ -267,7 +271,7 @@ class SettingsType( config.basicAuthPassword.value, // misc config.debugLogsEnabled.value, - config.gqlDebugLogsEnabled.value, + false, config.systemTrayEnabled.value, config.maxLogFiles.value, config.maxLogFileSize.value, diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt index 62f944bb..e8ae3b44 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt @@ -133,7 +133,6 @@ class ServerConfig( // misc val debugLogsEnabled: MutableStateFlow by OverrideConfigValue(BooleanConfigAdapter) - val gqlDebugLogsEnabled: MutableStateFlow by OverrideConfigValue(BooleanConfigAdapter) val systemTrayEnabled: MutableStateFlow by OverrideConfigValue(BooleanConfigAdapter) val maxLogFiles: MutableStateFlow by OverrideConfigValue(IntConfigAdapter) val maxLogFileSize: MutableStateFlow by OverrideConfigValue(StringConfigAdapter) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt index 37999abc..9d4aafc4 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt @@ -127,9 +127,6 @@ fun applicationSetup() { ) setupLogLevelUpdating(serverConfig.debugLogsEnabled, listOf(BASE_LOGGER_NAME)) - // gql "ExecutionStrategy" spams logs with "... completing field ..." - // gql "notprivacysafe" logs every received request multiple times (received, parsing, validating, executing) - setupLogLevelUpdating(serverConfig.gqlDebugLogsEnabled, listOf("graphql", "notprivacysafe"), Level.WARN) logger.info("Running Suwayomi-Server ${BuildConfig.VERSION} revision ${BuildConfig.REVISION}") diff --git a/server/src/main/resources/server-reference.conf b/server/src/main/resources/server-reference.conf index 8265e626..2f6cb2ae 100644 --- a/server/src/main/resources/server-reference.conf +++ b/server/src/main/resources/server-reference.conf @@ -49,7 +49,6 @@ server.basicAuthPassword = "" # misc server.debugLogsEnabled = false -server.gqlDebugLogsEnabled = false # this includes logs with non privacy safe information server.systemTrayEnabled = true server.maxLogFiles = 31 # the max number of days to keep files before they get deleted server.maxLogFileSize = "10mb" # the max size of a log file - possible values: 1 (bytes), 1KB (kilobytes), 1MB (megabytes), 1GB (gigabytes) diff --git a/server/src/test/resources/server-reference.conf b/server/src/test/resources/server-reference.conf index dee08efb..764b8c58 100644 --- a/server/src/test/resources/server-reference.conf +++ b/server/src/test/resources/server-reference.conf @@ -49,7 +49,6 @@ server.basicAuthPassword = "" # misc server.debugLogsEnabled = false -server.gqlDebugLogsEnabled = false # this includes logs with non privacy safe information server.systemTrayEnabled = true # backup