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

server/rest.rs: add method to log message

Browse Source
This commit is contained in:
Dietmar Maurer 2019-02-15 10:16:12 +01:00
parent f02e6fc478
commit d4736445fe
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/server/rest.rs
View File

@ -57,24 +57,22 @@ pub struct ApiService {
pub api_config: Arc<ApiConfig>, pub api_config: Arc<ApiConfig>,
} }
impl ApiService { fn log_response(method: hyper::Method, path: &str, resp: &Response<Body>) {
fn log_response(path: &str, resp: &Response<Body>) {
if resp.extensions().get::<NoLogExtension>().is_some() { return; }; if resp.extensions().get::<NoLogExtension>().is_some() { return; };
let status = resp.status(); let status = resp.status();
if !status.is_success() { if !status.is_success() {
let reason = status.canonical_reason().unwrap_or("unknown reason"); let reason = status.canonical_reason().unwrap_or("unknown reason");
let client = "unknown"; // fixme: howto get peer_addr ? let client = "unknown"; // fixme: howto get peer_addr ?
let mut message = "request failed"; let mut message = "request failed";
if let Some(data) = resp.extensions().get::<ErrorMessageExtension>() { if let Some(data) = resp.extensions().get::<ErrorMessageExtension>() {
message = &data.0; message = &data.0;
}
log::error!("{}: {} {}: [client {}] {}", path, status.as_str(), reason, client, message);
} }
log::error!("{} {}: {} {}: [client {}] {}", method.as_str(), path, status.as_str(), reason, client, message);
} }
} }
@ -86,22 +84,24 @@ impl Service for ApiService {
fn call(&mut self, req: Request<Self::ReqBody>) -> Self::Future { fn call(&mut self, req: Request<Self::ReqBody>) -> Self::Future {
let path = req.uri().path().to_owned(); let path = req.uri().path().to_owned();
let method = req.method().clone();
Box::new(handle_request(self.api_config.clone(), req).then(move |result| { Box::new(handle_request(self.api_config.clone(), req).then(move |result| {
match result { match result {
Ok(res) => { Ok(res) => {
Self::log_response(&path, &res); log_response(method, &path, &res);
Ok::<_, hyper::Error>(res) Ok::<_, hyper::Error>(res)
} }
Err(err) => { Err(err) => {
if let Some(apierr) = err.downcast_ref::<HttpError>() { if let Some(apierr) = err.downcast_ref::<HttpError>() {
let mut resp = Response::new(Body::from(apierr.message.clone())); let mut resp = Response::new(Body::from(apierr.message.clone()));
*resp.status_mut() = apierr.code; *resp.status_mut() = apierr.code;
Self::log_response(&path, &resp); log_response(method, &path, &resp);
Ok(resp) Ok(resp)
} else { } else {
let mut resp = Response::new(Body::from(err.to_string())); let mut resp = Response::new(Body::from(err.to_string()));
*resp.status_mut() = StatusCode::BAD_REQUEST; *resp.status_mut() = StatusCode::BAD_REQUEST;
Self::log_response(&path, &resp); log_response(method, &path, &resp);
Ok(resp) Ok(resp)
} }
} }