Skip to content

Commit ae58258

Browse files
committed
better loging
1 parent 1aa4177 commit ae58258

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

common/src/main/scala/models/Registration.scala

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,20 @@ object Registration {
1818
val base = Json.format[Registration]
1919
Format(
2020
Reads { json =>
21-
(json \ "topics").asOpt[JsArray].foreach { arr =>
22-
arr.value.foreach { v =>
21+
val invalid = (json \ "topics").asOpt[JsArray].toSeq.flatMap { arr =>
22+
arr.value.flatMap { v =>
2323
if (v.validate[Topic].isError) {
2424
val topicType = (v \ "type").asOpt[String].getOrElse("unknown")
2525
val topicName = (v \ "name").asOpt[String].getOrElse("unknown")
26-
logger.warn(s"Invalid topic type=$topicType topic id=$topicName")
27-
}
26+
Some(s"Topic Type=$topicType (Topic Id=$topicName)")
27+
} else None
2828
}
2929
}
30+
if (invalid.nonEmpty)
31+
logger.warn(s"Bad request: request contains invalid topic type(s). ${invalid.mkString(". ")}")
3032
base.reads(json)
3133
},
3234
base
3335
)
3436
}
35-
}
37+
}

registration/app/registration/CustomErrorHandler.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ class CustomErrorHandler(env: Environment, config: Configuration, sourceMapper:
1414
private val logger: Logger = LoggerFactory.getLogger(this.getClass)
1515
override def onBadRequest(request: RequestHeader, message: String): Future[Result] = {
1616
val debugInfo = request.headers.get("User-Agent")
17-
logger.error(s"Bad request due to $message. User agent = $debugInfo")
17+
if (!message.startsWith("Json validation error"))
18+
logger.error(s"Bad request due to $message. User agent = $debugInfo")
1819
Future.successful(BadRequest("Bad request"))
1920
}
2021
}

0 commit comments

Comments
 (0)