better broadcast error reporting

lichess-org · Jun 27, 2024 · 72ec470 · 72ec470
1 parent a58219e
commit 72ec470
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/modules/relay/src/main/RelayListing.scala b/modules/relay/src/main/RelayListing.scala
@@ -26,10 +26,9 @@ final class RelayListing(
  local = "_id",
  foreign = "tourId",
  pipe = List(
- $doc("$match" -> $doc("finished" -> false)),
- $doc("$addFields" -> $doc("sync.log" -> $arr())),
- $doc("$sort" -> RelayRoundRepo.sort.chrono),
- $doc("$limit" -> 1)
+ $doc("$match" -> $doc("finished" -> false)),
+ $doc("$sort" -> RelayRoundRepo.sort.chrono),
+ $doc("$limit" -> 1)
  )
  )
  for

diff --git a/modules/relay/src/main/RelayTour.scala b/modules/relay/src/main/RelayTour.scala
@@ -85,7 +85,13 @@ object RelayTour:
  display: RelayRound, // which round to show on the tour link
  link: RelayRound, // which round to actually link to
  group: Option[RelayGroup.Name]
- ) extends RelayRound.AndTourAndGroup
+ ) extends RelayRound.AndTourAndGroup:
+ def errors: List[String] =
+ val round = display
+ ~round.sync.log.lastErrors.some
+ .filter(_.nonEmpty)
+ .orElse:
+ (round.hasStarted && !round.sync.ongoing).option(List("Not syncing!"))
 
  case class WithLastRound(tour: RelayTour, round: RelayRound, group: Option[RelayGroup.Name])
  extends RelayRound.AndTourAndGroup:

diff --git a/modules/relay/src/main/ui/RelayTourUi.scala b/modules/relay/src/main/ui/RelayTourUi.scala
@@ -51,7 +51,7 @@ final class RelayTourUi(helpers: Helpers, ui: RelayUi):
  )
 
  private def adminIndex(active: List[RelayTour.ActiveWithSomeRounds])(using Context) =
- val errored = active.flatMap(a => a.link.sync.log.lastErrors.some.filter(_.nonEmpty).map(a -> _))
+ val errored = active.flatMap(a => a.errors.some.filter(_.nonEmpty).map(a -> _))
  errored.nonEmpty.option:
  div(cls := "relay-index__admin")(
  h2("Ongoing broadcasts with errors"),