Skip to content

Commit

Permalink
Switch database logger to SLF4J
Browse files Browse the repository at this point in the history
  • Loading branch information
@Syer10
Syer10 committed Apr 1, 2023
1 parent 4c30d8a commit eb197eb
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 25 deletions.
4 changes: 3 additions & 1 deletion server/src/main/kotlin/suwayomi/tachidesk/graphql/GraphQL.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

package suwayomi.tachidesk.graphql

import io.javalin.apibuilder.ApiBuilder.*
import io.javalin.apibuilder.ApiBuilder.get
import io.javalin.apibuilder.ApiBuilder.post
import io.javalin.apibuilder.ApiBuilder.ws
import suwayomi.tachidesk.graphql.controller.GraphQLController

object GraphQL {
Expand Down
6 changes: 3 additions & 3 deletions server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/CategoryDataLoader.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package suwayomi.tachidesk.graphql.dataLoaders
import com.expediagroup.graphql.dataloader.KotlinDataLoader
import org.dataloader.DataLoader
import org.dataloader.DataLoaderFactory
import org.jetbrains.exposed.sql.StdOutSqlLogger
import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
import org.jetbrains.exposed.sql.addLogger
import org.jetbrains.exposed.sql.select
import org.jetbrains.exposed.sql.transactions.transaction
Expand All @@ -24,7 +24,7 @@ class CategoryDataLoader : KotlinDataLoader<Int, CategoryType> {
override fun getDataLoader(): DataLoader<Int, CategoryType> = DataLoaderFactory.newDataLoader<Int, CategoryType> { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)
CategoryTable.select { CategoryTable.id inList ids }
.map { CategoryType(it) }
}
Expand All @@ -37,7 +37,7 @@ class CategoriesForMangaDataLoader : KotlinDataLoader<Int, List<CategoryType>> {
override fun getDataLoader(): DataLoader<Int, List<CategoryType>> = DataLoaderFactory.newDataLoader<Int, List<CategoryType>> { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)
val itemsByRef = CategoryMangaTable.innerJoin(CategoryTable)
.select { CategoryMangaTable.manga inList ids }
.map { Pair(it[CategoryMangaTable.manga].value, CategoryType(it)) }
Expand Down
6 changes: 3 additions & 3 deletions server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ChapterDataLoader.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package suwayomi.tachidesk.graphql.dataLoaders
import com.expediagroup.graphql.dataloader.KotlinDataLoader
import org.dataloader.DataLoader
import org.dataloader.DataLoaderFactory
import org.jetbrains.exposed.sql.StdOutSqlLogger
import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
import org.jetbrains.exposed.sql.addLogger
import org.jetbrains.exposed.sql.select
import org.jetbrains.exposed.sql.transactions.transaction
Expand All @@ -23,7 +23,7 @@ class ChapterDataLoader : KotlinDataLoader<Int, ChapterType> {
override fun getDataLoader(): DataLoader<Int, ChapterType> = DataLoaderFactory.newDataLoader<Int, ChapterType> { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)
ChapterTable.select { ChapterTable.id inList ids }
.map { ChapterType(it) }
}
Expand All @@ -36,7 +36,7 @@ class ChaptersForMangaDataLoader : KotlinDataLoader<Int, List<ChapterType>> {
override fun getDataLoader(): DataLoader<Int, List<ChapterType>> = DataLoaderFactory.newDataLoader<Int, List<ChapterType>> { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)
val chaptersByMangaId = ChapterTable.select { ChapterTable.manga inList ids }
.map { ChapterType(it) }
.groupBy { it.mangaId }
Expand Down
6 changes: 3 additions & 3 deletions server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionDataLoader.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package suwayomi.tachidesk.graphql.dataLoaders
import com.expediagroup.graphql.dataloader.KotlinDataLoader
import org.dataloader.DataLoader
import org.dataloader.DataLoaderFactory
import org.jetbrains.exposed.sql.StdOutSqlLogger
import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
import org.jetbrains.exposed.sql.addLogger
import org.jetbrains.exposed.sql.select
import org.jetbrains.exposed.sql.transactions.transaction
Expand All @@ -24,7 +24,7 @@ class ExtensionDataLoader : KotlinDataLoader<String, ExtensionType> {
override fun getDataLoader(): DataLoader<String, ExtensionType> = DataLoaderFactory.newDataLoader { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)
ExtensionTable.select { ExtensionTable.pkgName inList ids }
.map { ExtensionType(it) }
}
Expand All @@ -37,7 +37,7 @@ class ExtensionForSourceDataLoader : KotlinDataLoader<Long, ExtensionType> {
override fun getDataLoader(): DataLoader<Long, ExtensionType> = DataLoaderFactory.newDataLoader { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)
ExtensionTable.innerJoin(SourceTable)
.select { SourceTable.id inList ids }
.map { ExtensionType(it) }
Expand Down
7 changes: 3 additions & 4 deletions server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MangaDataLoader.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ package suwayomi.tachidesk.graphql.dataLoaders
import com.expediagroup.graphql.dataloader.KotlinDataLoader
import org.dataloader.DataLoader
import org.dataloader.DataLoaderFactory
import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
import org.jetbrains.exposed.sql.StdOutSqlLogger
import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
import org.jetbrains.exposed.sql.addLogger
import org.jetbrains.exposed.sql.select
import org.jetbrains.exposed.sql.transactions.transaction
Expand All @@ -25,7 +24,7 @@ class MangaDataLoader : KotlinDataLoader<Int, MangaType> {
override fun getDataLoader(): DataLoader<Int, MangaType> = DataLoaderFactory.newDataLoader<Int, MangaType> { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)
MangaTable.select { MangaTable.id inList ids }
.map { MangaType(it) }
}
Expand All @@ -38,7 +37,7 @@ class MangaForCategoryDataLoader : KotlinDataLoader<Int, List<MangaType>> {
override fun getDataLoader(): DataLoader<Int, List<MangaType>> = DataLoaderFactory.newDataLoader<Int, List<MangaType>> { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)
val itemsByRef = CategoryMangaTable.innerJoin(MangaTable).select { CategoryMangaTable.category inList ids }
.map { Pair(it[CategoryMangaTable.category].value, MangaType(it)) }
.groupBy { it.first }
Expand Down
8 changes: 4 additions & 4 deletions server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MetaDataLoader.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package suwayomi.tachidesk.graphql.dataLoaders
import com.expediagroup.graphql.dataloader.KotlinDataLoader
import org.dataloader.DataLoader
import org.dataloader.DataLoaderFactory
import org.jetbrains.exposed.sql.StdOutSqlLogger
import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
import org.jetbrains.exposed.sql.addLogger
import org.jetbrains.exposed.sql.select
import org.jetbrains.exposed.sql.transactions.transaction
Expand All @@ -20,7 +20,7 @@ class ChapterMetaDataLoader : KotlinDataLoader<Int, MetaType> {
override fun getDataLoader(): DataLoader<Int, MetaType> = DataLoaderFactory.newDataLoader<Int, MetaType> { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)
val metasByRefId = ChapterMetaTable.select { ChapterMetaTable.ref inList ids }
.map { ChapterMetaItem(it) }
.groupBy { it.ref }
Expand All @@ -35,7 +35,7 @@ class MangaMetaDataLoader : KotlinDataLoader<Int, MetaType> {
override fun getDataLoader(): DataLoader<Int, MetaType> = DataLoaderFactory.newDataLoader<Int, MetaType> { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)
val metasByRefId = MangaMetaTable.select { MangaMetaTable.ref inList ids }
.map { MangaMetaItem(it) }
.groupBy { it.ref }
Expand All @@ -50,7 +50,7 @@ class CategoryMetaDataLoader : KotlinDataLoader<Int, MetaType> {
override fun getDataLoader(): DataLoader<Int, MetaType> = DataLoaderFactory.newDataLoader<Int, MetaType> { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)
val metasByRefId = MangaMetaTable.select { MangaMetaTable.ref inList ids }
.map { CategoryMetaItem(it) }
.groupBy { it.ref }
Expand Down
8 changes: 4 additions & 4 deletions server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/SourceDataLoader.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ package suwayomi.tachidesk.graphql.dataLoaders
import com.expediagroup.graphql.dataloader.KotlinDataLoader
import org.dataloader.DataLoader
import org.dataloader.DataLoaderFactory
import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
import org.jetbrains.exposed.sql.StdOutSqlLogger
import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
import org.jetbrains.exposed.sql.addLogger
import org.jetbrains.exposed.sql.select
import org.jetbrains.exposed.sql.transactions.transaction
Expand All @@ -26,6 +25,7 @@ class SourceDataLoader : KotlinDataLoader<Long, SourceType?> {
override fun getDataLoader(): DataLoader<Long, SourceType?> = DataLoaderFactory.newDataLoader { ids ->
future {
transaction {
addLogger(Slf4jSqlDebugLogger)
SourceTable.select { SourceTable.id inList ids }.map {
SourceType(it)
}
Expand All @@ -39,7 +39,7 @@ class SourceForMangaDataLoader : KotlinDataLoader<Int, SourceType?> {
override fun getDataLoader(): DataLoader<Int, SourceType?> = DataLoaderFactory.newDataLoader { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)

val itemsByRef = MangaTable.innerJoin(SourceTable)
.select { MangaTable.id inList ids }
Expand Down Expand Up @@ -68,7 +68,7 @@ class SourcesForExtensionDataLoader : KotlinDataLoader<String, List<SourceType>>
override fun getDataLoader(): DataLoader<String, List<SourceType>> = DataLoaderFactory.newDataLoader { ids ->
future {
transaction {
addLogger(StdOutSqlLogger)
addLogger(Slf4jSqlDebugLogger)

val sourcesByExtensionPkg = SourceTable.innerJoin(ExtensionTable)
.select { ExtensionTable.pkgName inList ids }
Expand Down
5 changes: 4 additions & 1 deletion server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ package suwayomi.tachidesk.graphql.mutations

import com.expediagroup.graphql.server.extensions.getValuesFromDataLoader
import graphql.schema.DataFetchingEnvironment
import org.jetbrains.exposed.sql.*
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
import org.jetbrains.exposed.sql.and
import org.jetbrains.exposed.sql.batchInsert
import org.jetbrains.exposed.sql.deleteWhere
import org.jetbrains.exposed.sql.transactions.transaction
import org.jetbrains.exposed.sql.update
import suwayomi.tachidesk.graphql.types.ChapterType
import suwayomi.tachidesk.manga.model.table.ChapterMetaTable
import suwayomi.tachidesk.manga.model.table.ChapterTable
Expand Down
1 change: 1 addition & 0 deletions server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import java.util.concurrent.CompletableFuture
* - Filter by downloaded
* - Filter by scanlators
* - Sort? Upload date, source order, last read, chapter number
* - Get page list?
*
* TODO Mutations
* - Last page read
Expand Down
14 changes: 13 additions & 1 deletion ...r/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskDataLoaderRegistryFactory.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,19 @@
package suwayomi.tachidesk.graphql.server

import com.expediagroup.graphql.dataloader.KotlinDataLoaderRegistryFactory
import suwayomi.tachidesk.graphql.dataLoaders.*
import suwayomi.tachidesk.graphql.dataLoaders.CategoriesForMangaDataLoader
import suwayomi.tachidesk.graphql.dataLoaders.CategoryMetaDataLoader
import suwayomi.tachidesk.graphql.dataLoaders.ChapterDataLoader
import suwayomi.tachidesk.graphql.dataLoaders.ChapterMetaDataLoader
import suwayomi.tachidesk.graphql.dataLoaders.ChaptersForMangaDataLoader
import suwayomi.tachidesk.graphql.dataLoaders.ExtensionDataLoader
import suwayomi.tachidesk.graphql.dataLoaders.ExtensionForSourceDataLoader
import suwayomi.tachidesk.graphql.dataLoaders.MangaDataLoader
import suwayomi.tachidesk.graphql.dataLoaders.MangaForCategoryDataLoader
import suwayomi.tachidesk.graphql.dataLoaders.MangaMetaDataLoader
import suwayomi.tachidesk.graphql.dataLoaders.SourceDataLoader
import suwayomi.tachidesk.graphql.dataLoaders.SourceForMangaDataLoader
import suwayomi.tachidesk.graphql.dataLoaders.SourcesForExtensionDataLoader

class TachideskDataLoaderRegistryFactory {
companion object {
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/kotlin/suwayomi/tachidesk/manga/controller/UpdateController.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ object UpdateController {

updater.addMangasToQueue(
mangasToUpdate
.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, MangaDataClass::title)),
.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, MangaDataClass::title))
)
}

Expand Down

0 comments on commit eb197eb

Please sign in to comment.