TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-02 13:32:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix decoding joex responses in JoexClient

Browse Source
This commit is contained in:
Eike Kettner 2020-07-15 20:45:07 +02:00
parent f33aa969d8
commit 94089fd0b6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/joexapi/src/main/scala/docspell/joexapi/client/JoexClient.scala
View File

@ -17,7 +17,7 @@ import org.log4s.getLogger
trait JoexClient[F[_]] { trait JoexClient[F[_]] {
def notifyJoex(base: LenientUri): F[Unit] def notifyJoex(base: LenientUri): F[BasicResult]
def notifyJoexIgnoreErrors(base: LenientUri): F[Unit] def notifyJoexIgnoreErrors(base: LenientUri): F[Unit]
@ -31,21 +31,25 @@ object JoexClient {
def apply[F[_]: Sync](client: Client[F]): JoexClient[F] = def apply[F[_]: Sync](client: Client[F]): JoexClient[F] =
new JoexClient[F] { new JoexClient[F] {
def notifyJoex(base: LenientUri): F[Unit] = { def notifyJoex(base: LenientUri): F[BasicResult] = {
val notifyUrl = base / "api" / "v1" / "notify" val notifyUrl = base / "api" / "v1" / "notify"
val req = Request[F](Method.POST, uri(notifyUrl)) val req = Request[F](Method.POST, uri(notifyUrl))
logger.fdebug(s"Notify joex at ${notifyUrl.asString}") *> logger.fdebug(s"Notify joex at ${notifyUrl.asString}") *>
client.expect[String](req).map(_ => ()) client.expect[BasicResult](req)
} }
def notifyJoexIgnoreErrors(base: LenientUri): F[Unit] = def notifyJoexIgnoreErrors(base: LenientUri): F[Unit] =
notifyJoex(base).attempt.map { notifyJoex(base).attempt.map {
case Right(()) => () case Right(BasicResult(succ, msg)) =>
if (succ) ()
else
logger.warn(
s"Notifying Joex instance '${base.asString}' returned with failure: ${msg}"
)
case Left(ex) => case Left(ex) =>
logger.warn( logger.warn(
s"Notifying Joex instance '${base.asString}' failed: ${ex.getMessage}" s"Notifying Joex instance '${base.asString}' failed: ${ex.getMessage}"
) )
()
} }
def cancelJob(base: LenientUri, job: Ident): F[BasicResult] = { def cancelJob(base: LenientUri, job: Ident): F[BasicResult] = {