Make it compile again

This commit is contained in:
Quentin 2020-11-19 14:56:00 +01:00
parent fc427b0b66
commit 04f455ff7f
4 changed files with 57 additions and 2 deletions

1
Cargo.lock generated
View file

@ -430,6 +430,7 @@ dependencies = [
"bytes 0.4.12", "bytes 0.4.12",
"chrono", "chrono",
"crypto-mac", "crypto-mac",
"err-derive",
"futures", "futures",
"futures-util", "futures-util",
"garage_model 0.1.1", "garage_model 0.1.1",

51
src/web/error.rs Normal file
View file

@ -0,0 +1,51 @@
use err_derive::Error;
use hyper::StatusCode;
use garage_util::error::Error as GarageError;
#[derive(Debug, Error)]
pub enum Error {
// Category: internal error
#[error(display = "Internal error: {}", _0)]
InternalError(#[error(source)] GarageError),
#[error(display = "Internal error (Hyper error): {}", _0)]
Hyper(#[error(source)] hyper::Error),
#[error(display = "Internal error (HTTP error): {}", _0)]
HTTP(#[error(source)] http::Error),
// Category: cannot process
#[error(display = "Forbidden: {}", _0)]
Forbidden(String),
#[error(display = "Not found")]
NotFound,
// Category: bad request
#[error(display = "Invalid UTF-8: {}", _0)]
InvalidUTF8(#[error(source)] std::str::Utf8Error),
#[error(display = "Invalid XML: {}", _0)]
InvalidXML(#[error(source)] roxmltree::Error),
#[error(display = "Invalid header value: {}", _0)]
InvalidHeader(#[error(source)] hyper::header::ToStrError),
#[error(display = "Bad request: {}", _0)]
BadRequest(String),
}
impl Error {
pub fn http_status_code(&self) -> StatusCode {
match self {
Error::NotFound => StatusCode::NOT_FOUND,
Error::Forbidden(_) => StatusCode::FORBIDDEN,
Error::InternalError(GarageError::RPC(_)) => StatusCode::SERVICE_UNAVAILABLE,
Error::InternalError(_) | Error::Hyper(_) | Error::HTTP(_) => {
StatusCode::INTERNAL_SERVER_ERROR
}
_ => StatusCode::BAD_REQUEST,
}
}
}

View file

@ -1,4 +1,6 @@
#[macro_use] #[macro_use]
extern crate log; extern crate log;
pub mod error;
pub mod web_server; pub mod web_server;

View file

@ -11,12 +11,13 @@ use hyper::service::{make_service_fn, service_fn};
use hyper::{Body, Request, Response, Server}; use hyper::{Body, Request, Response, Server};
use garage_model::garage::Garage; use garage_model::garage::Garage;
use garage_util::error::Error; use garage_util::error::Error as GarageError;
use crate::error::*;
pub async fn run_web_server( pub async fn run_web_server(
garage: Arc<Garage>, garage: Arc<Garage>,
shutdown_signal: impl Future<Output = ()>, shutdown_signal: impl Future<Output = ()>,
) -> Result<(), Error> { ) -> Result<(), GarageError> {
let addr = &garage.config.s3_web.bind_addr; let addr = &garage.config.s3_web.bind_addr;
let service = make_service_fn(|conn: &AddrStream| { let service = make_service_fn(|conn: &AddrStream| {