diff options
| author | Alex Auvolat <alex@adnab.me> | 2021-10-15 11:05:09 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2021-10-22 16:55:24 +0200 |
| commit | 1b450c4b493dfcb2ee88acbca3ea584beac8eb4b (patch) | |
| tree | d6437f105a630fa197b67446b5c3b2902335c34a /src/web | |
| parent | 4067797d0142ee7860aff8da95d65820d6cc0889 (diff) | |
| download | garage-1b450c4b493dfcb2ee88acbca3ea584beac8eb4b.tar.gz garage-1b450c4b493dfcb2ee88acbca3ea584beac8eb4b.zip | |
Improvements to CLI and various fixes for netapp version
Discovery via consul, persist peer list to file
Diffstat (limited to 'src/web')
| -rw-r--r-- | src/web/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/web/error.rs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/web/Cargo.toml b/src/web/Cargo.toml index 99b4481b..f5b40370 100644 --- a/src/web/Cargo.toml +++ b/src/web/Cargo.toml @@ -26,4 +26,4 @@ percent-encoding = "2.1.0" futures = "0.3" http = "0.2" -hyper = "0.14" +hyper = { version = "0.14", features = ["server", "http1", "runtime", "tcp", "stream"] } diff --git a/src/web/error.rs b/src/web/error.rs index 08717ce1..5ac27914 100644 --- a/src/web/error.rs +++ b/src/web/error.rs @@ -38,7 +38,9 @@ impl Error { match self { Error::NotFound => StatusCode::NOT_FOUND, Error::ApiError(e) => e.http_status_code(), - Error::InternalError(GarageError::Rpc(_)) => StatusCode::SERVICE_UNAVAILABLE, + Error::InternalError( + GarageError::Timeout | GarageError::RemoteError(_) | GarageError::TooManyErrors(_), + ) => StatusCode::SERVICE_UNAVAILABLE, Error::InternalError(_) => StatusCode::INTERNAL_SERVER_ERROR, _ => StatusCode::BAD_REQUEST, } |