TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 10:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use job group instead of parsing the task arguments

Browse Source
This commit is contained in:
eikek 2021-11-07 22:39:44 +01:00
parent a09f75e45e
commit 61c01ad79b
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/backend/src/main/scala/docspell/backend/msg/JobDone.scala
View File

@ -13,7 +13,13 @@ import io.circe.generic.semiauto.{deriveDecoder, deriveEncoder}
import io.circe.{Decoder, Encoder} import io.circe.{Decoder, Encoder}
/** Message to notify about finished jobs. They have a final state. */ /** Message to notify about finished jobs. They have a final state. */
final case class JobDone(jobId: Ident, task: Ident, args: String, state: JobState) final case class JobDone(
jobId: Ident,
group: Ident,
task: Ident,
args: String,
state: JobState
)
object JobDone { object JobDone {
implicit val jsonDecoder: Decoder[JobDone] = implicit val jsonDecoder: Decoder[JobDone] =
deriveDecoder[JobDone] deriveDecoder[JobDone]

2
modules/joex/src/main/scala/docspell/joex/scheduler/SchedulerImpl.scala
View File

@ -204,7 +204,7 @@ final class SchedulerImpl[F[_]: Async](
_ <- QJob.setFinalState(job.id, finalState, store) _ <- QJob.setFinalState(job.id, finalState, store)
_ <- pubSub.publish1IgnoreErrors( _ <- pubSub.publish1IgnoreErrors(
JobDone.topic, JobDone.topic,
JobDone(job.id, job.task, job.args, finalState) JobDone(job.id, job.group, job.task, job.args, finalState)
) )
} yield () } yield ()

8
modules/restserver/src/main/scala/docspell/restserver/Subscriptions.scala
View File

@ -8,10 +8,8 @@ package docspell.restserver
import fs2.Stream import fs2.Stream
import fs2.concurrent.Topic import fs2.concurrent.Topic
import docspell.backend.msg.JobDone import docspell.backend.msg.JobDone
import docspell.common._ import docspell.common.ProcessItemArgs
import docspell.common.syntax.StringSyntax._
import docspell.pubsub.api.PubSubT import docspell.pubsub.api.PubSubT
import docspell.restserver.ws.OutputEvent import docspell.restserver.ws.OutputEvent
@ -29,7 +27,5 @@ object Subscriptions {
pubSub pubSub
.subscribe(JobDone.topic) .subscribe(JobDone.topic)
.filter(m => m.body.task == ProcessItemArgs.taskName) .filter(m => m.body.task == ProcessItemArgs.taskName)
.map(m => m.body.args.parseJsonAs[ProcessItemArgs]) .map(m => OutputEvent.ItemProcessed(m.body.group))
.collect { case Right(a) => OutputEvent.ItemProcessed(a.meta.collective) }
} }