rabbah commented on a change in pull request #2218: Port Controller from Spray
to Akka
URL:
https://github.com/apache/incubator-openwhisk/pull/2218#discussion_r132805647
##########
File path: common/scala/src/main/scala/whisk/http/BasicHttpService.scala
##########
@@ -86,39 +86,47 @@ trait BasicHttpService extends HttpService with
TransactionCounter {
*/
def loglevelForRoute(route: String): Logging.LogLevel = Logging.InfoLevel
+ /** Rejection handler to terminate connection on a bad request. Delegates
to Akka handler. */
+ val prioritizeRejections = recoverRejections { rejections =>
+ val priorityRejection = rejections.find {
+ case rejection: UnacceptedResponseContentTypeRejection => true
+ case _ => false
+ }
+
+ priorityRejection.map(rejection =>
Rejected(Seq(rejection))).getOrElse(Rejected(rejections))
+ }
+
/**
* Receives a message and runs the router.
*/
- def receive = runRoute(
+ def route: Route = {
assignId { implicit transid =>
- DebuggingDirectives.logRequest(logRequestInfo _) {
- DebuggingDirectives.logRequestResponse(logResponseInfo _) {
- routes
+ handleRejections(customRejectionHandler) {
+ prioritizeRejections {
+ DebuggingDirectives.logRequest(logRequestInfo _) {
+ DebuggingDirectives.logRequestResult(logResponseInfo
_) {
+ toStrictEntity(1.second) {
+ routes
+ }
+ }
+ }
}
}
- })
+ }
+ }
+
+ def receive = {
+ case _ =>
+ }
/** Assigns transaction id to every request. */
protected val assignId = extract(_ => transid())
- /** Rejection handler to terminate connection on a bad request. Delegates
to Spray handler. */
-
- protected def customRejectionHandler(implicit transid: TransactionId) =
RejectionHandler {
Review comment:
is my understanding correct that the prioritization above lowers the
priority on the auth rejection?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
