digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 01:07:18 +03:00
Code Issues Projects Releases Wiki Activity

Tweak error handling in listTriggers helper (#6247)

Browse Source 
changelog_begin
changelog_end
This commit is contained in:
Rohan Jacob-Rao 2020-06-05 16:32:49 -04:00 committed by GitHub
parent de2b5d195e
commit 3159c617f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
triggers/service/src/main/scala/com/digitalasset/daml/lf/engine/trigger/ServiceMain.scala
View File

@ -238,12 +238,12 @@ object Server {
)
}
def listTriggers(jwt: Jwt): (StatusCode, JsObject) = {
server.listRunningTriggers(jwt) match {
case Left(err) => errorResponse(StatusCodes.InternalServerError, err.toString)
case Right(triggerInstances) =>
successResponse(JsObject(("triggerIds", triggerInstances.map(_.toString).toJson)))
}
def listTriggers(jwt: Jwt): Either[String, JsValue] = {
server
.listRunningTriggers(jwt)
.map(
triggerInstances => JsObject(("triggerIds", triggerInstances.map(_.toString).toJson))
)
}
val route = concat(
@ -317,17 +317,24 @@ object Server {
},
// List triggers currently running for the given party.
path("v1" / "list") {
extractRequest { request =>
TokenManagement
.findJwt(request)
.flatMap { jwt =>
TokenManagement.decodeAndParsePayload(jwt, TokenManagement.decodeJwt)
}
.fold(
unauthorized =>
complete(errorResponse(StatusCodes.UnprocessableEntity, unauthorized.message)),
token => complete(listTriggers(token._1))
)
extractRequest {
request =>
TokenManagement
.findJwt(request)
.flatMap { jwt =>
TokenManagement.decodeAndParsePayload(jwt, TokenManagement.decodeJwt)
}
.fold(
unauthorized =>
complete(
errorResponse(StatusCodes.UnprocessableEntity, unauthorized.message)),
token =>
listTriggers(token._1) match {
case Left(err) =>
complete(errorResponse(StatusCodes.InternalServerError, err))
case Right(triggerInstances) => complete(successResponse(triggerInstances))
}
)
}
},
// Produce logs for the given trigger.