snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-27 08:41:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

serve static site

Browse Source
This commit is contained in:
Marin Postma
2021-04-21 13:49:21 +02:00
parent bb79695e44
commit 6bcf20c70e
7 changed files with 114 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meilisearch-http/src/error.rs
View File

@ -2,7 +2,8 @@ use std::error;
use std::fmt;
use actix_web as aweb;
use actix_web::dev::HttpResponseBuilder;
use actix_web::body::Body;
use actix_web::dev::BaseHttpResponseBuilder;
use actix_web::error::{JsonPayloadError, QueryPayloadError};
use actix_web::http::Error as HttpError;
use actix_web::http::StatusCode;
@ -71,8 +72,9 @@ impl Serialize for ResponseError {
}
impl aweb::error::ResponseError for ResponseError {
fn error_response(&self) -> aweb::HttpResponse {
HttpResponseBuilder::new(self.status_code()).json(&self)
fn error_response(&self) -> aweb::BaseHttpResponse<Body> {
let json = serde_json::to_vec(self).unwrap();
BaseHttpResponseBuilder::new(self.status_code()).body(json)
}
fn status_code(&self) -> StatusCode {
@ -297,6 +299,7 @@ impl From<JsonPayloadError> for Error {
JsonPayloadError::Payload(err) => {
Error::BadRequest(format!("Problem while decoding the request: {}", err))
}
e => Error::Internal(format!("Unexpected Json error: {}", e))
}
}
}
@ -307,6 +310,7 @@ impl From<QueryPayloadError> for Error {
QueryPayloadError::Deserialize(err) => {
Error::BadRequest(format!("Invalid query parameters: {}", err))
}
e => Error::Internal(format!("Unexpected query payload error: {}", e))
}
}
}