aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorQuentin <quentin@deuxfleurs.fr>2020-11-19 14:39:30 +0100
committerQuentin <quentin@deuxfleurs.fr>2020-11-19 14:39:30 +0100
commitfc427b0b66241785ecd3fe23ec3e4ac72aaed1da (patch)
treeea406de04a7a11c09c6d758ca97ba53fc2bdfbe4 /src/util
parent6076d869b14aa38059d54a2dece222ad7b9da3bc (diff)
parent044d7988779aadac9290b58ceb077c1211670aed (diff)
downloadgarage-fc427b0b66241785ecd3fe23ec3e4ac72aaed1da.tar.gz
garage-fc427b0b66241785ecd3fe23ec3e4ac72aaed1da.zip
Merge branch 'master' into feature/website
Diffstat (limited to 'src/util')
-rw-r--r--src/util/error.rs37
1 files changed, 2 insertions, 35 deletions
diff --git a/src/util/error.rs b/src/util/error.rs
index 0ca1afe7..e5dcf654 100644
--- a/src/util/error.rs
+++ b/src/util/error.rs
@@ -54,9 +54,6 @@ pub enum Error {
#[error(display = "TOML decode error: {}", _0)]
TomlDecode(#[error(source)] toml::de::Error),
- #[error(display = "Timeout: {}", _0)]
- RPCTimeout(#[error(source)] tokio::time::Elapsed),
-
#[error(display = "Tokio join error: {}", _0)]
TokioJoin(#[error(source)] tokio::task::JoinError),
@@ -66,14 +63,8 @@ pub enum Error {
#[error(display = "Remote error: {} (status code {})", _0, _1)]
RemoteError(String, StatusCode),
- #[error(display = "Bad request: {}", _0)]
- BadRequest(String),
-
- #[error(display = "Forbidden: {}", _0)]
- Forbidden(String),
-
- #[error(display = "Not found")]
- NotFound,
+ #[error(display = "Bad RPC: {}", _0)]
+ BadRPC(String),
#[error(display = "Corrupt data: does not match hash {:?}", _0)]
CorruptData(Hash),
@@ -82,18 +73,6 @@ pub enum Error {
Message(String),
}
-impl Error {
- pub fn http_status_code(&self) -> StatusCode {
- match self {
- Error::BadRequest(_) => StatusCode::BAD_REQUEST,
- Error::NotFound => StatusCode::NOT_FOUND,
- Error::Forbidden(_) => StatusCode::FORBIDDEN,
- Error::RPC(_) => StatusCode::SERVICE_UNAVAILABLE,
- _ => StatusCode::INTERNAL_SERVER_ERROR,
- }
- }
-}
-
impl From<sled::TransactionError<Error>> for Error {
fn from(e: sled::TransactionError<Error>) -> Error {
match e {
@@ -114,15 +93,3 @@ impl<T> From<tokio::sync::mpsc::error::SendError<T>> for Error {
Error::Message(format!("MPSC send error"))
}
}
-
-impl From<std::str::Utf8Error> for Error {
- fn from(e: std::str::Utf8Error) -> Error {
- Error::BadRequest(format!("Invalid UTF-8: {}", e))
- }
-}
-
-impl From<roxmltree::Error> for Error {
- fn from(e: roxmltree::Error) -> Error {
- Error::BadRequest(format!("Invalid XML: {}", e))
- }
-}