TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-07-04 16:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1601 from eikek/addon-install-fix

Browse Source 
Fix starting a background task to install an addon
This commit is contained in:
mergify[bot]
2022-06-17 20:52:42 +00:00
committed by GitHub
parent 15b698d8b6 7b535e59a6
commit 483dbf5d2b
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/restserver/src/main/scala/docspell/restserver/ws/Background.scala
View File

@ -24,20 +24,15 @@ object Background {
)(run: F[A])(implicit enc: OutputEventEncoder[A]): F[Unit] = { )(run: F[A])(implicit enc: OutputEventEncoder[A]): F[Unit] = {
val log = logger.getOrElse(docspell.logging.getLogger[F]) val log = logger.getOrElse(docspell.logging.getLogger[F])
Async[F] Async[F]
.background(run) .start {
.use( run.map(enc.encode).attempt.flatMap {
_.flatMap( case Right(ev) =>
_.fold( log.info(s"Sending response from async operation: $ev") *>
log.warn("The background operation has been cancelled!"), wsTopic.publish1(ev).void
ex => log.error(ex)("Error running background operation!"), case Left(ex) =>
event => log.warn(ex)(s"Background operation failed!")
event }
.map(enc.encode) }
.flatTap(ev => log.info(s"Sending response from async operation: $ev")) .as(())
.flatMap(wsTopic.publish1)
.void
)
)
)
} }
} }