WIP: More restructuring to have ApiService be a future.

This commit is contained in:
Luke Anderson
2019-09-10 15:35:54 +10:00
parent 405a59e8b9
commit 965d6f1df9
3 changed files with 40 additions and 21 deletions

View File

@@ -1,15 +1,8 @@
use hyper::{Body, Method, Request, Response, Server, StatusCode};
use std::error::Error as StdError;
type Cause = Box<dyn StdErr + Send + Sync>;
pub struct ApiError {
kind: ApiErrorKind,
cause: Option<Cause>,
}
#[derive(PartialEq, Debug)]
pub enum ApiErrorKind {
pub enum ApiError {
MethodNotAllowed(String),
ServerError(String),
NotImplemented(String),
@@ -20,21 +13,27 @@ pub enum ApiErrorKind {
pub type ApiResult = Result<Response<Body>, ApiError>;
impl Into<Response<Body>> for ApiError {
fn into(self) -> Response<Body> {
let status_code: (StatusCode, String) = match self {
impl ApiError {
pub fn status_code(&self) -> (StatusCode, &String) {
match self {
ApiError::MethodNotAllowed(desc) => (StatusCode::METHOD_NOT_ALLOWED, desc),
ApiError::ServerError(desc) => (StatusCode::INTERNAL_SERVER_ERROR, desc),
ApiError::NotImplemented(desc) => (StatusCode::NOT_IMPLEMENTED, desc),
ApiError::InvalidQueryParams(desc) => (StatusCode::BAD_REQUEST, desc),
ApiError::NotFound(desc) => (StatusCode::NOT_FOUND, desc),
ApiError::ImATeapot(desc) => (StatusCode::IM_A_TEAPOT, desc),
};
}
}
}
impl Into<Response<Body>> for ApiError {
fn into(self) -> Response<Body> {
let status_code = self.status_code();
Response::builder()
.status(status_code.0)
.header("content-type", "text/plain")
.body(Body::from(status_code.1))
.expect("Response should always be created.")
.status(status_code.0)
.header("content-type", "text/plain")
.body(Body::from(*status_code.1))
.expect("Response should always be created.")
}
}
@@ -56,6 +55,15 @@ impl From<state_processing::per_slot_processing::Error> for ApiError {
}
}
impl std::error::Error for ApiError {
fn cause(&self) -> Option<&Error> {}
impl StdError for ApiError {
fn cause(&self) -> Option<&StdError> {
None
}
}
impl std::fmt::Display for ApiError {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
let status = self.status_code();
write!(f, "{:?}: {:?}", status.0, status.1)
}
}