Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2026-05-09 05:10:19 +02:00
Code Issues Projects Releases Wiki Activity

feat(sse): publish breakdown of task count by task type

Browse source
This commit is contained in:
Gauthier Roebroeck 2021-07-06 09:38:06 +08:00
parent 547167feb5
commit eda767aeb5
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskReceiver.kt
View file

@ -9,6 +9,7 @@ import org.gotson.komga.domain.model.Media
import org.gotson.komga.domain.persistence.BookRepository import org.gotson.komga.domain.persistence.BookRepository
import org.gotson.komga.domain.persistence.LibraryRepository import org.gotson.komga.domain.persistence.LibraryRepository
import org.gotson.komga.domain.service.BookConverter import org.gotson.komga.domain.service.BookConverter
import org.gotson.komga.infrastructure.jms.QUEUE_SUB_TYPE
import org.gotson.komga.infrastructure.jms.QUEUE_TASKS import org.gotson.komga.infrastructure.jms.QUEUE_TASKS
import org.gotson.komga.infrastructure.jms.QUEUE_TASKS_TYPE import org.gotson.komga.infrastructure.jms.QUEUE_TASKS_TYPE
import org.gotson.komga.infrastructure.jms.QUEUE_TYPE import org.gotson.komga.infrastructure.jms.QUEUE_TYPE
@ -109,6 +110,7 @@ class TaskReceiver(
it.apply { it.apply {
setStringProperty(QUEUE_TYPE, QUEUE_TASKS_TYPE) setStringProperty(QUEUE_TYPE, QUEUE_TASKS_TYPE)
setStringProperty(QUEUE_UNIQUE_ID, task.uniqueId()) setStringProperty(QUEUE_UNIQUE_ID, task.uniqueId())
setStringProperty(QUEUE_SUB_TYPE, task::class.simpleName)
} }
} }
} }

1
komga/src/main/kotlin/org/gotson/komga/infrastructure/jms/ArtemisConfig.kt
View file

@ -13,6 +13,7 @@ import org.apache.activemq.artemis.core.config.Configuration as ArtemisConfigura
const val QUEUE_UNIQUE_ID = "unique_id" const val QUEUE_UNIQUE_ID = "unique_id"
const val QUEUE_TYPE = "type" const val QUEUE_TYPE = "type"
const val QUEUE_SUB_TYPE = "subtype"
const val QUEUE_TASKS = "tasks.background" const val QUEUE_TASKS = "tasks.background"
const val QUEUE_TASKS_TYPE = "task" const val QUEUE_TASKS_TYPE = "task"

14
komga/src/main/kotlin/org/gotson/komga/interfaces/sse/SseController.kt
View file

@ -6,6 +6,7 @@ import org.gotson.komga.domain.model.KomgaUser
import org.gotson.komga.domain.persistence.BookRepository import org.gotson.komga.domain.persistence.BookRepository
import org.gotson.komga.infrastructure.jms.QUEUE_SSE import org.gotson.komga.infrastructure.jms.QUEUE_SSE
import org.gotson.komga.infrastructure.jms.QUEUE_SSE_SELECTOR import org.gotson.komga.infrastructure.jms.QUEUE_SSE_SELECTOR
import org.gotson.komga.infrastructure.jms.QUEUE_SUB_TYPE
import org.gotson.komga.infrastructure.jms.QUEUE_TASKS import org.gotson.komga.infrastructure.jms.QUEUE_TASKS
import org.gotson.komga.infrastructure.jms.TOPIC_FACTORY import org.gotson.komga.infrastructure.jms.TOPIC_FACTORY
import org.gotson.komga.infrastructure.security.KomgaPrincipal import org.gotson.komga.infrastructure.security.KomgaPrincipal
@ -31,6 +32,7 @@ import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter import org.springframework.web.servlet.mvc.method.annotation.SseEmitter
import java.io.IOException import java.io.IOException
import java.util.Collections import java.util.Collections
import javax.jms.ObjectMessage
import javax.jms.QueueBrowser import javax.jms.QueueBrowser
import javax.jms.Session import javax.jms.Session
@ -57,11 +59,15 @@ class SseController(
@Scheduled(fixedRate = 10_000) @Scheduled(fixedRate = 10_000)
fun taskCount() { fun taskCount() {
val size = jmsTemplate.browse(QUEUE_TASKS) { _: Session, browser: QueueBrowser -> if (emitters.isNotEmpty()) {
browser.enumeration.toList().size val tasksCount = jmsTemplate.browse(QUEUE_TASKS) { _: Session, browser: QueueBrowser ->
} ?: 0 browser.enumeration.toList()
.groupingBy { (it as ObjectMessage).getStringProperty(QUEUE_SUB_TYPE) ?: "unknown" }
.eachCount()
} ?: emptyMap()
emitSse("TaskQueueStatus", TaskQueueSseDto(size), adminOnly = true) emitSse("TaskQueueStatus", TaskQueueSseDto(tasksCount.values.sum(), tasksCount), adminOnly = true)
}
} }
@JmsListener(destination = QUEUE_SSE, selector = QUEUE_SSE_SELECTOR, containerFactory = TOPIC_FACTORY) @JmsListener(destination = QUEUE_SSE, selector = QUEUE_SSE_SELECTOR, containerFactory = TOPIC_FACTORY)

1
komga/src/main/kotlin/org/gotson/komga/interfaces/sse/dto/TaskQueueSseDto.kt
View file

@ -2,4 +2,5 @@ package org.gotson.komga.interfaces.sse.dto
data class TaskQueueSseDto( data class TaskQueueSseDto(
val count: Int, val count: Int,
val countByType: Map<String, Int>
) )