tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use better http status codes

This commit is contained in:
Dietmar Maurer 2018-11-10 10:32:25 +01:00
parent 260c1ee8c6
commit 6639c14bd9
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.rs
View File

@ -80,12 +80,11 @@ fn handle_api_request<'a>(
let json_str = value.to_string(); let json_str = value.to_string();
Ok(Response::builder() Ok(Response::builder()
.status(200) .status(StatusCode::OK)
.header("ContentType", "application/json") .header("ContentType", "application/json")
.body(Body::from(json_str)) .body(Body::from(json_str))?)
.unwrap()) // fixme: really?
} }
Err(err) => Ok(error_response!(NOT_FOUND, err.to_string())) Err(err) => Ok(error_response!(BAD_REQUEST, err.to_string()))
} }
}); });
@ -110,7 +109,7 @@ fn handle_request(req: Request<Body>) -> BoxFut {
if comp_len >= 2 { if comp_len >= 2 {
let format = components[1]; let format = components[1];
if format != "json" { if format != "json" {
http_error_future!(NOT_FOUND, format!("Unsupported format '{}'\n", format)) http_error_future!(BAD_REQUEST, format!("Unsupported output format '{}'.", format))
} }
if let Some(info) = ROUTER.find_method(&components[2..]) { if let Some(info) = ROUTER.find_method(&components[2..]) {
@ -124,7 +123,7 @@ fn handle_request(req: Request<Body>) -> BoxFut {
}; };
let api_method = match api_method_opt { let api_method = match api_method_opt {
Some(m) => m, Some(m) => m,
_ => http_error_future!(NOT_FOUND, format!("No such method '{} {}'\n", method, path)), _ => http_error_future!(NOT_FOUND, format!("No such method '{}'.", method)),
}; };
// fixme: handle auth // fixme: handle auth
@ -132,7 +131,7 @@ fn handle_request(req: Request<Body>) -> BoxFut {
return handle_api_request(api_method, parts, body); return handle_api_request(api_method, parts, body);
} else { } else {
http_error_future!(NOT_FOUND, format!("No such path '{}'\n", path)); http_error_future!(NOT_FOUND, "Path not found.");
} }
} }
} }
@ -155,7 +154,7 @@ fn main() {
handle_request(req).then(|result| -> Result<Response<Body>, String> { handle_request(req).then(|result| -> Result<Response<Body>, String> {
match result { match result {
Ok(res) => Ok(res), Ok(res) => Ok(res),
Err(err) => Ok(error_response!(NOT_FOUND, err.to_string())), Err(err) => Ok(error_response!(BAD_REQUEST, err.to_string())),
} }
}) })
}) })