rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup dispatch messages and comments.

This commit is contained in:
Sergio Benitez 2016-10-07 23:37:29 -07:00
parent 8c0d11feab
commit c4b817ae0b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/src/rocket.rs
View File

@ -91,7 +91,7 @@ impl Rocket {
let outcome = responder.respond(res); let outcome = responder.respond(res);
info_!("{} {}", White.paint("Outcome:"), outcome); info_!("{} {}", White.paint("Outcome:"), outcome);
// Get the result if we failed forward so we can try again. // Check if the responder wants to forward to a catcher.
match outcome { match outcome {
Outcome::Forward((c, r)) => return self.handle_error(c, &request, r), Outcome::Forward((c, r)) => return self.handle_error(c, &request, r),
Outcome::Success | Outcome::Failure => return, Outcome::Success | Outcome::Failure => return,
@ -128,16 +128,18 @@ impl Rocket {
code: StatusCode, code: StatusCode,
req: &'r Request, req: &'r Request,
response: FreshHyperResponse) { response: FreshHyperResponse) {
error_!("dispatch failed: {}.", code); error_!("Dispatch failed: {}.", code);
let catcher = self.catchers.get(&code.to_u16()).unwrap(); let catcher = self.catchers.get(&code.to_u16()).unwrap();
if let Some(mut responder) = catcher.handle(Error::NoRoute, req).responder() { if let Some(mut responder) = catcher.handle(Error::NoRoute, req).responder() {
if responder.respond(response) != Outcome::Success { if responder.respond(response) != Outcome::Success {
error_!("catcher outcome was unsuccessul; aborting response"); error_!("Catcher outcome was unsuccessul; aborting response.");
} else {
info_!("Responded with catcher.");
} }
} else { } else {
error_!("catcher returned an incomplete response"); error_!("Catcher returned an incomplete response.");
warn_!("using default error response"); warn_!("Using default error response.");
let catcher = self.default_catchers.get(&code.to_u16()).unwrap(); let catcher = self.default_catchers.get(&code.to_u16()).unwrap();
let responder = catcher.handle(Error::Internal, req).responder(); let responder = catcher.handle(Error::Internal, req).responder();
responder.unwrap().respond(response).expect_success() responder.unwrap().respond(response).expect_success()