diff options
| author | Quentin <quentin@deuxfleurs.fr> | 2020-11-19 14:56:00 +0100 |
|---|---|---|
| committer | Quentin <quentin@deuxfleurs.fr> | 2020-11-19 14:56:00 +0100 |
| commit | 04f455ff7f673ae9449b374183b8aafb9347581f (patch) | |
| tree | 0eff6e61d6a0a7d9c7eaf5bed99dba0c53f85352 /src/web/web_server.rs | |
| parent | fc427b0b66241785ecd3fe23ec3e4ac72aaed1da (diff) | |
| download | garage-04f455ff7f673ae9449b374183b8aafb9347581f.tar.gz garage-04f455ff7f673ae9449b374183b8aafb9347581f.zip | |
Make it compile again
Diffstat (limited to 'src/web/web_server.rs')
| -rw-r--r-- | src/web/web_server.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/web/web_server.rs b/src/web/web_server.rs index 3cc0fa43..4771d209 100644 --- a/src/web/web_server.rs +++ b/src/web/web_server.rs @@ -11,12 +11,13 @@ use hyper::service::{make_service_fn, service_fn}; use hyper::{Body, Request, Response, Server}; 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( garage: Arc<Garage>, shutdown_signal: impl Future<Output = ()>, -) -> Result<(), Error> { +) -> Result<(), GarageError> { let addr = &garage.config.s3_web.bind_addr; let service = make_service_fn(|conn: &AddrStream| { |